diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/outsideService/service/approvedDetail.vue b/src/views/resource/outsideService/service/approvedDetail.vue
deleted file mode 100644
index c95d349..0000000
--- a/src/views/resource/outsideService/service/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="ServiceEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="外部服务评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/outsideService/service/approvedDetail.vue b/src/views/resource/outsideService/service/approvedDetail.vue
deleted file mode 100644
index c95d349..0000000
--- a/src/views/resource/outsideService/service/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="ServiceEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="外部服务评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/person/trainSign/detail.vue b/src/views/resource/person/trainSign/detail.vue
index aea4857..531612d 100644
--- a/src/views/resource/person/trainSign/detail.vue
+++ b/src/views/resource/person/trainSign/detail.vue
@@ -242,14 +242,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   const res = await getStream({ id: id.value, pdf: isPdf })
-  if (res.code === 200) {
-    stream.value = res.data
-    streamNormal.value = true
-  }
-  else {
-    ElMessage.warning('未获取到流文件，请联系管理员')
-    streamNormal.value = false
-  }
+  stream.value = res.data
   loading.close()
 }
 

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/outsideService/service/approvedDetail.vue b/src/views/resource/outsideService/service/approvedDetail.vue
deleted file mode 100644
index c95d349..0000000
--- a/src/views/resource/outsideService/service/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="ServiceEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="外部服务评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/person/trainSign/detail.vue b/src/views/resource/person/trainSign/detail.vue
index aea4857..531612d 100644
--- a/src/views/resource/person/trainSign/detail.vue
+++ b/src/views/resource/person/trainSign/detail.vue
@@ -242,14 +242,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   const res = await getStream({ id: id.value, pdf: isPdf })
-  if (res.code === 200) {
-    stream.value = res.data
-    streamNormal.value = true
-  }
-  else {
-    ElMessage.warning('未获取到流文件，请联系管理员')
-    streamNormal.value = false
-  }
+  stream.value = res.data
   loading.close()
 }
 
diff --git a/src/views/resource/person/trainSign/list.vue b/src/views/resource/person/trainSign/list.vue
index 1da5a33..28a8ffd 100644
--- a/src/views/resource/person/trainSign/list.vue
+++ b/src/views/resource/person/trainSign/list.vue
@@ -1,11 +1,12 @@
 <!-- 培训签到表列表 -->
 <script name="TrainSignList" lang="ts" setup>
 import type { DateModelType } from 'element-plus'
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRegistrationForm, ISignListQuery } from './train-interface'
-import { deleteTrainSignInfo, getTrainSignList } from '@/api/resource/train'
+import { deleteTrainSignInfo, exportTrainList, getTrainSignList } from '@/api/resource/train'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 
 // 定义变量
 const { proxy } = getCurrentInstance() as any
@@ -33,11 +34,41 @@
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表头
 const list = ref([]) // 表格数据
+const checkoutList = ref([]) // 多选表格数据
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
 // 逻辑
 // 导出列表
 const batchExportList = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      fileCode: searchQuery.value.fileCode,
+      position: searchQuery.value.position,
+      host: searchQuery.value.host,
+      beginTime: searchQuery.value.beginTime,
+      endTime: searchQuery.value.endTime,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportTrainList(params).then((res) => {
+      const blob = new Blob([res.data])
+      loading.close()
+      exportFile(blob, '培训签到表.xlsx')
+    })
+  }
+  else {
+    loading.close()
+    ElMessage.warning('无数据可导出数据')
+  }
 }
 
 const addTrain = () => {
@@ -212,6 +243,7 @@
         :list-loading="loadingTable"
         :is-showmulti-select="true"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/outsideService/service/approvedDetail.vue b/src/views/resource/outsideService/service/approvedDetail.vue
deleted file mode 100644
index c95d349..0000000
--- a/src/views/resource/outsideService/service/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="ServiceEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="外部服务评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/person/trainSign/detail.vue b/src/views/resource/person/trainSign/detail.vue
index aea4857..531612d 100644
--- a/src/views/resource/person/trainSign/detail.vue
+++ b/src/views/resource/person/trainSign/detail.vue
@@ -242,14 +242,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   const res = await getStream({ id: id.value, pdf: isPdf })
-  if (res.code === 200) {
-    stream.value = res.data
-    streamNormal.value = true
-  }
-  else {
-    ElMessage.warning('未获取到流文件，请联系管理员')
-    streamNormal.value = false
-  }
+  stream.value = res.data
   loading.close()
 }
 
diff --git a/src/views/resource/person/trainSign/list.vue b/src/views/resource/person/trainSign/list.vue
index 1da5a33..28a8ffd 100644
--- a/src/views/resource/person/trainSign/list.vue
+++ b/src/views/resource/person/trainSign/list.vue
@@ -1,11 +1,12 @@
 <!-- 培训签到表列表 -->
 <script name="TrainSignList" lang="ts" setup>
 import type { DateModelType } from 'element-plus'
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRegistrationForm, ISignListQuery } from './train-interface'
-import { deleteTrainSignInfo, getTrainSignList } from '@/api/resource/train'
+import { deleteTrainSignInfo, exportTrainList, getTrainSignList } from '@/api/resource/train'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 
 // 定义变量
 const { proxy } = getCurrentInstance() as any
@@ -33,11 +34,41 @@
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表头
 const list = ref([]) // 表格数据
+const checkoutList = ref([]) // 多选表格数据
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
 // 逻辑
 // 导出列表
 const batchExportList = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      fileCode: searchQuery.value.fileCode,
+      position: searchQuery.value.position,
+      host: searchQuery.value.host,
+      beginTime: searchQuery.value.beginTime,
+      endTime: searchQuery.value.endTime,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportTrainList(params).then((res) => {
+      const blob = new Blob([res.data])
+      loading.close()
+      exportFile(blob, '培训签到表.xlsx')
+    })
+  }
+  else {
+    loading.close()
+    ElMessage.warning('无数据可导出数据')
+  }
 }
 
 const addTrain = () => {
@@ -212,6 +243,7 @@
         :list-loading="loadingTable"
         :is-showmulti-select="true"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/software/info/detail.vue b/src/views/resource/software/info/detail.vue
index 60cdea7..1adf2b6 100644
--- a/src/views/resource/software/info/detail.vue
+++ b/src/views/resource/software/info/detail.vue
@@ -106,7 +106,7 @@
 
 // 编辑
 const updateById = () => {
-  updateSoftwareInfo(softwareInfo.value).then((res) => {
+  updateSoftwareInfo({ ...softwareInfo.value, updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss') }).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/outsideService/service/approvedDetail.vue b/src/views/resource/outsideService/service/approvedDetail.vue
deleted file mode 100644
index c95d349..0000000
--- a/src/views/resource/outsideService/service/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="ServiceEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="外部服务评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/person/trainSign/detail.vue b/src/views/resource/person/trainSign/detail.vue
index aea4857..531612d 100644
--- a/src/views/resource/person/trainSign/detail.vue
+++ b/src/views/resource/person/trainSign/detail.vue
@@ -242,14 +242,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   const res = await getStream({ id: id.value, pdf: isPdf })
-  if (res.code === 200) {
-    stream.value = res.data
-    streamNormal.value = true
-  }
-  else {
-    ElMessage.warning('未获取到流文件，请联系管理员')
-    streamNormal.value = false
-  }
+  stream.value = res.data
   loading.close()
 }
 
diff --git a/src/views/resource/person/trainSign/list.vue b/src/views/resource/person/trainSign/list.vue
index 1da5a33..28a8ffd 100644
--- a/src/views/resource/person/trainSign/list.vue
+++ b/src/views/resource/person/trainSign/list.vue
@@ -1,11 +1,12 @@
 <!-- 培训签到表列表 -->
 <script name="TrainSignList" lang="ts" setup>
 import type { DateModelType } from 'element-plus'
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRegistrationForm, ISignListQuery } from './train-interface'
-import { deleteTrainSignInfo, getTrainSignList } from '@/api/resource/train'
+import { deleteTrainSignInfo, exportTrainList, getTrainSignList } from '@/api/resource/train'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 
 // 定义变量
 const { proxy } = getCurrentInstance() as any
@@ -33,11 +34,41 @@
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表头
 const list = ref([]) // 表格数据
+const checkoutList = ref([]) // 多选表格数据
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
 // 逻辑
 // 导出列表
 const batchExportList = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      fileCode: searchQuery.value.fileCode,
+      position: searchQuery.value.position,
+      host: searchQuery.value.host,
+      beginTime: searchQuery.value.beginTime,
+      endTime: searchQuery.value.endTime,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportTrainList(params).then((res) => {
+      const blob = new Blob([res.data])
+      loading.close()
+      exportFile(blob, '培训签到表.xlsx')
+    })
+  }
+  else {
+    loading.close()
+    ElMessage.warning('无数据可导出数据')
+  }
 }
 
 const addTrain = () => {
@@ -212,6 +243,7 @@
         :list-loading="loadingTable"
         :is-showmulti-select="true"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/software/info/detail.vue b/src/views/resource/software/info/detail.vue
index 60cdea7..1adf2b6 100644
--- a/src/views/resource/software/info/detail.vue
+++ b/src/views/resource/software/info/detail.vue
@@ -106,7 +106,7 @@
 
 // 编辑
 const updateById = () => {
-  updateSoftwareInfo(softwareInfo.value).then((res) => {
+  updateSoftwareInfo({ ...softwareInfo.value, updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss') }).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
diff --git a/src/views/resource/software/info/list.vue b/src/views/resource/software/info/list.vue
index a174c3c..73ab906 100644
--- a/src/views/resource/software/info/list.vue
+++ b/src/views/resource/software/info/list.vue
@@ -28,7 +28,7 @@
   { text: '软件名称', value: 'softwareName', align: 'center' },
   { text: '当前版本号', value: 'softwareVersion', align: 'center', width: '200' },
   { text: '创建人', value: 'createUserName', align: 'center', width: '200' },
-  { text: '更新时间', value: 'createTime', align: 'center', width: '200' },
+  { text: '更新时间', value: 'updateTime', align: 'center', width: '200' },
 ])
 const softwareList = ref<Array<ISoftwareInfo>>([]) // 表格数据
 
@@ -135,7 +135,7 @@
         <el-input v-model="searchQuery.softwareName" placeholder="软件名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.softwareVersion" placeholder="软件版本" clearable />
+        <el-input v-model="searchQuery.softwareVersion" placeholder="版本号" clearable />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/outsideService/service/approvedDetail.vue b/src/views/resource/outsideService/service/approvedDetail.vue
deleted file mode 100644
index c95d349..0000000
--- a/src/views/resource/outsideService/service/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="ServiceEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="外部服务评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/person/trainSign/detail.vue b/src/views/resource/person/trainSign/detail.vue
index aea4857..531612d 100644
--- a/src/views/resource/person/trainSign/detail.vue
+++ b/src/views/resource/person/trainSign/detail.vue
@@ -242,14 +242,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   const res = await getStream({ id: id.value, pdf: isPdf })
-  if (res.code === 200) {
-    stream.value = res.data
-    streamNormal.value = true
-  }
-  else {
-    ElMessage.warning('未获取到流文件，请联系管理员')
-    streamNormal.value = false
-  }
+  stream.value = res.data
   loading.close()
 }
 
diff --git a/src/views/resource/person/trainSign/list.vue b/src/views/resource/person/trainSign/list.vue
index 1da5a33..28a8ffd 100644
--- a/src/views/resource/person/trainSign/list.vue
+++ b/src/views/resource/person/trainSign/list.vue
@@ -1,11 +1,12 @@
 <!-- 培训签到表列表 -->
 <script name="TrainSignList" lang="ts" setup>
 import type { DateModelType } from 'element-plus'
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRegistrationForm, ISignListQuery } from './train-interface'
-import { deleteTrainSignInfo, getTrainSignList } from '@/api/resource/train'
+import { deleteTrainSignInfo, exportTrainList, getTrainSignList } from '@/api/resource/train'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 
 // 定义变量
 const { proxy } = getCurrentInstance() as any
@@ -33,11 +34,41 @@
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表头
 const list = ref([]) // 表格数据
+const checkoutList = ref([]) // 多选表格数据
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
 // 逻辑
 // 导出列表
 const batchExportList = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      fileCode: searchQuery.value.fileCode,
+      position: searchQuery.value.position,
+      host: searchQuery.value.host,
+      beginTime: searchQuery.value.beginTime,
+      endTime: searchQuery.value.endTime,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportTrainList(params).then((res) => {
+      const blob = new Blob([res.data])
+      loading.close()
+      exportFile(blob, '培训签到表.xlsx')
+    })
+  }
+  else {
+    loading.close()
+    ElMessage.warning('无数据可导出数据')
+  }
 }
 
 const addTrain = () => {
@@ -212,6 +243,7 @@
         :list-loading="loadingTable"
         :is-showmulti-select="true"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/software/info/detail.vue b/src/views/resource/software/info/detail.vue
index 60cdea7..1adf2b6 100644
--- a/src/views/resource/software/info/detail.vue
+++ b/src/views/resource/software/info/detail.vue
@@ -106,7 +106,7 @@
 
 // 编辑
 const updateById = () => {
-  updateSoftwareInfo(softwareInfo.value).then((res) => {
+  updateSoftwareInfo({ ...softwareInfo.value, updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss') }).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
diff --git a/src/views/resource/software/info/list.vue b/src/views/resource/software/info/list.vue
index a174c3c..73ab906 100644
--- a/src/views/resource/software/info/list.vue
+++ b/src/views/resource/software/info/list.vue
@@ -28,7 +28,7 @@
   { text: '软件名称', value: 'softwareName', align: 'center' },
   { text: '当前版本号', value: 'softwareVersion', align: 'center', width: '200' },
   { text: '创建人', value: 'createUserName', align: 'center', width: '200' },
-  { text: '更新时间', value: 'createTime', align: 'center', width: '200' },
+  { text: '更新时间', value: 'updateTime', align: 'center', width: '200' },
 ])
 const softwareList = ref<Array<ISoftwareInfo>>([]) // 表格数据
 
@@ -135,7 +135,7 @@
         <el-input v-model="searchQuery.softwareName" placeholder="软件名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.softwareVersion" placeholder="软件版本" clearable />
+        <el-input v-model="searchQuery.softwareVersion" placeholder="版本号" clearable />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
diff --git a/src/views/resource/software/review/approvedDetail.vue b/src/views/resource/software/review/approvedDetail.vue
new file mode 100644
index 0000000..d3d24f5
--- /dev/null
+++ b/src/views/resource/software/review/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 软件评审报告 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/softwareReport'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '软件评审报告.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '软件评审报告.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="软件评审报告">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/outsideService/service/approvedDetail.vue b/src/views/resource/outsideService/service/approvedDetail.vue
deleted file mode 100644
index c95d349..0000000
--- a/src/views/resource/outsideService/service/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="ServiceEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="外部服务评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/person/trainSign/detail.vue b/src/views/resource/person/trainSign/detail.vue
index aea4857..531612d 100644
--- a/src/views/resource/person/trainSign/detail.vue
+++ b/src/views/resource/person/trainSign/detail.vue
@@ -242,14 +242,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   const res = await getStream({ id: id.value, pdf: isPdf })
-  if (res.code === 200) {
-    stream.value = res.data
-    streamNormal.value = true
-  }
-  else {
-    ElMessage.warning('未获取到流文件，请联系管理员')
-    streamNormal.value = false
-  }
+  stream.value = res.data
   loading.close()
 }
 
diff --git a/src/views/resource/person/trainSign/list.vue b/src/views/resource/person/trainSign/list.vue
index 1da5a33..28a8ffd 100644
--- a/src/views/resource/person/trainSign/list.vue
+++ b/src/views/resource/person/trainSign/list.vue
@@ -1,11 +1,12 @@
 <!-- 培训签到表列表 -->
 <script name="TrainSignList" lang="ts" setup>
 import type { DateModelType } from 'element-plus'
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRegistrationForm, ISignListQuery } from './train-interface'
-import { deleteTrainSignInfo, getTrainSignList } from '@/api/resource/train'
+import { deleteTrainSignInfo, exportTrainList, getTrainSignList } from '@/api/resource/train'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 
 // 定义变量
 const { proxy } = getCurrentInstance() as any
@@ -33,11 +34,41 @@
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表头
 const list = ref([]) // 表格数据
+const checkoutList = ref([]) // 多选表格数据
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
 // 逻辑
 // 导出列表
 const batchExportList = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      fileCode: searchQuery.value.fileCode,
+      position: searchQuery.value.position,
+      host: searchQuery.value.host,
+      beginTime: searchQuery.value.beginTime,
+      endTime: searchQuery.value.endTime,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportTrainList(params).then((res) => {
+      const blob = new Blob([res.data])
+      loading.close()
+      exportFile(blob, '培训签到表.xlsx')
+    })
+  }
+  else {
+    loading.close()
+    ElMessage.warning('无数据可导出数据')
+  }
 }
 
 const addTrain = () => {
@@ -212,6 +243,7 @@
         :list-loading="loadingTable"
         :is-showmulti-select="true"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/software/info/detail.vue b/src/views/resource/software/info/detail.vue
index 60cdea7..1adf2b6 100644
--- a/src/views/resource/software/info/detail.vue
+++ b/src/views/resource/software/info/detail.vue
@@ -106,7 +106,7 @@
 
 // 编辑
 const updateById = () => {
-  updateSoftwareInfo(softwareInfo.value).then((res) => {
+  updateSoftwareInfo({ ...softwareInfo.value, updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss') }).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
diff --git a/src/views/resource/software/info/list.vue b/src/views/resource/software/info/list.vue
index a174c3c..73ab906 100644
--- a/src/views/resource/software/info/list.vue
+++ b/src/views/resource/software/info/list.vue
@@ -28,7 +28,7 @@
   { text: '软件名称', value: 'softwareName', align: 'center' },
   { text: '当前版本号', value: 'softwareVersion', align: 'center', width: '200' },
   { text: '创建人', value: 'createUserName', align: 'center', width: '200' },
-  { text: '更新时间', value: 'createTime', align: 'center', width: '200' },
+  { text: '更新时间', value: 'updateTime', align: 'center', width: '200' },
 ])
 const softwareList = ref<Array<ISoftwareInfo>>([]) // 表格数据
 
@@ -135,7 +135,7 @@
         <el-input v-model="searchQuery.softwareName" placeholder="软件名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.softwareVersion" placeholder="软件版本" clearable />
+        <el-input v-model="searchQuery.softwareVersion" placeholder="版本号" clearable />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
diff --git a/src/views/resource/software/review/approvedDetail.vue b/src/views/resource/software/review/approvedDetail.vue
new file mode 100644
index 0000000..d3d24f5
--- /dev/null
+++ b/src/views/resource/software/review/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 软件评审报告 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/softwareReport'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '软件评审报告.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '软件评审报告.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="软件评审报告">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index ce1065d..228bba1 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -548,6 +548,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'review-report-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'review-report-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'review-report-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/outsideService/service/approvedDetail.vue b/src/views/resource/outsideService/service/approvedDetail.vue
deleted file mode 100644
index c95d349..0000000
--- a/src/views/resource/outsideService/service/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="ServiceEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="外部服务评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/person/trainSign/detail.vue b/src/views/resource/person/trainSign/detail.vue
index aea4857..531612d 100644
--- a/src/views/resource/person/trainSign/detail.vue
+++ b/src/views/resource/person/trainSign/detail.vue
@@ -242,14 +242,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   const res = await getStream({ id: id.value, pdf: isPdf })
-  if (res.code === 200) {
-    stream.value = res.data
-    streamNormal.value = true
-  }
-  else {
-    ElMessage.warning('未获取到流文件，请联系管理员')
-    streamNormal.value = false
-  }
+  stream.value = res.data
   loading.close()
 }
 
diff --git a/src/views/resource/person/trainSign/list.vue b/src/views/resource/person/trainSign/list.vue
index 1da5a33..28a8ffd 100644
--- a/src/views/resource/person/trainSign/list.vue
+++ b/src/views/resource/person/trainSign/list.vue
@@ -1,11 +1,12 @@
 <!-- 培训签到表列表 -->
 <script name="TrainSignList" lang="ts" setup>
 import type { DateModelType } from 'element-plus'
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRegistrationForm, ISignListQuery } from './train-interface'
-import { deleteTrainSignInfo, getTrainSignList } from '@/api/resource/train'
+import { deleteTrainSignInfo, exportTrainList, getTrainSignList } from '@/api/resource/train'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 
 // 定义变量
 const { proxy } = getCurrentInstance() as any
@@ -33,11 +34,41 @@
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表头
 const list = ref([]) // 表格数据
+const checkoutList = ref([]) // 多选表格数据
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
 // 逻辑
 // 导出列表
 const batchExportList = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      fileCode: searchQuery.value.fileCode,
+      position: searchQuery.value.position,
+      host: searchQuery.value.host,
+      beginTime: searchQuery.value.beginTime,
+      endTime: searchQuery.value.endTime,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportTrainList(params).then((res) => {
+      const blob = new Blob([res.data])
+      loading.close()
+      exportFile(blob, '培训签到表.xlsx')
+    })
+  }
+  else {
+    loading.close()
+    ElMessage.warning('无数据可导出数据')
+  }
 }
 
 const addTrain = () => {
@@ -212,6 +243,7 @@
         :list-loading="loadingTable"
         :is-showmulti-select="true"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/software/info/detail.vue b/src/views/resource/software/info/detail.vue
index 60cdea7..1adf2b6 100644
--- a/src/views/resource/software/info/detail.vue
+++ b/src/views/resource/software/info/detail.vue
@@ -106,7 +106,7 @@
 
 // 编辑
 const updateById = () => {
-  updateSoftwareInfo(softwareInfo.value).then((res) => {
+  updateSoftwareInfo({ ...softwareInfo.value, updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss') }).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
diff --git a/src/views/resource/software/info/list.vue b/src/views/resource/software/info/list.vue
index a174c3c..73ab906 100644
--- a/src/views/resource/software/info/list.vue
+++ b/src/views/resource/software/info/list.vue
@@ -28,7 +28,7 @@
   { text: '软件名称', value: 'softwareName', align: 'center' },
   { text: '当前版本号', value: 'softwareVersion', align: 'center', width: '200' },
   { text: '创建人', value: 'createUserName', align: 'center', width: '200' },
-  { text: '更新时间', value: 'createTime', align: 'center', width: '200' },
+  { text: '更新时间', value: 'updateTime', align: 'center', width: '200' },
 ])
 const softwareList = ref<Array<ISoftwareInfo>>([]) // 表格数据
 
@@ -135,7 +135,7 @@
         <el-input v-model="searchQuery.softwareName" placeholder="软件名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.softwareVersion" placeholder="软件版本" clearable />
+        <el-input v-model="searchQuery.softwareVersion" placeholder="版本号" clearable />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
diff --git a/src/views/resource/software/review/approvedDetail.vue b/src/views/resource/software/review/approvedDetail.vue
new file mode 100644
index 0000000..d3d24f5
--- /dev/null
+++ b/src/views/resource/software/review/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 软件评审报告 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/softwareReport'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '软件评审报告.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '软件评审报告.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="软件评审报告">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index ce1065d..228bba1 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -548,6 +548,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'review-report-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'review-report-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'review-report-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/software/review/list.vue b/src/views/resource/software/review/list.vue
index a83a4c8..545b8c4 100644
--- a/src/views/resource/software/review/list.vue
+++ b/src/views/resource/software/review/list.vue
@@ -69,6 +69,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'review/detail',
   })

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/outsideService/service/approvedDetail.vue b/src/views/resource/outsideService/service/approvedDetail.vue
deleted file mode 100644
index c95d349..0000000
--- a/src/views/resource/outsideService/service/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="ServiceEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="外部服务评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/person/trainSign/detail.vue b/src/views/resource/person/trainSign/detail.vue
index aea4857..531612d 100644
--- a/src/views/resource/person/trainSign/detail.vue
+++ b/src/views/resource/person/trainSign/detail.vue
@@ -242,14 +242,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   const res = await getStream({ id: id.value, pdf: isPdf })
-  if (res.code === 200) {
-    stream.value = res.data
-    streamNormal.value = true
-  }
-  else {
-    ElMessage.warning('未获取到流文件，请联系管理员')
-    streamNormal.value = false
-  }
+  stream.value = res.data
   loading.close()
 }
 
diff --git a/src/views/resource/person/trainSign/list.vue b/src/views/resource/person/trainSign/list.vue
index 1da5a33..28a8ffd 100644
--- a/src/views/resource/person/trainSign/list.vue
+++ b/src/views/resource/person/trainSign/list.vue
@@ -1,11 +1,12 @@
 <!-- 培训签到表列表 -->
 <script name="TrainSignList" lang="ts" setup>
 import type { DateModelType } from 'element-plus'
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRegistrationForm, ISignListQuery } from './train-interface'
-import { deleteTrainSignInfo, getTrainSignList } from '@/api/resource/train'
+import { deleteTrainSignInfo, exportTrainList, getTrainSignList } from '@/api/resource/train'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 
 // 定义变量
 const { proxy } = getCurrentInstance() as any
@@ -33,11 +34,41 @@
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表头
 const list = ref([]) // 表格数据
+const checkoutList = ref([]) // 多选表格数据
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
 // 逻辑
 // 导出列表
 const batchExportList = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      fileCode: searchQuery.value.fileCode,
+      position: searchQuery.value.position,
+      host: searchQuery.value.host,
+      beginTime: searchQuery.value.beginTime,
+      endTime: searchQuery.value.endTime,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportTrainList(params).then((res) => {
+      const blob = new Blob([res.data])
+      loading.close()
+      exportFile(blob, '培训签到表.xlsx')
+    })
+  }
+  else {
+    loading.close()
+    ElMessage.warning('无数据可导出数据')
+  }
 }
 
 const addTrain = () => {
@@ -212,6 +243,7 @@
         :list-loading="loadingTable"
         :is-showmulti-select="true"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/software/info/detail.vue b/src/views/resource/software/info/detail.vue
index 60cdea7..1adf2b6 100644
--- a/src/views/resource/software/info/detail.vue
+++ b/src/views/resource/software/info/detail.vue
@@ -106,7 +106,7 @@
 
 // 编辑
 const updateById = () => {
-  updateSoftwareInfo(softwareInfo.value).then((res) => {
+  updateSoftwareInfo({ ...softwareInfo.value, updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss') }).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
diff --git a/src/views/resource/software/info/list.vue b/src/views/resource/software/info/list.vue
index a174c3c..73ab906 100644
--- a/src/views/resource/software/info/list.vue
+++ b/src/views/resource/software/info/list.vue
@@ -28,7 +28,7 @@
   { text: '软件名称', value: 'softwareName', align: 'center' },
   { text: '当前版本号', value: 'softwareVersion', align: 'center', width: '200' },
   { text: '创建人', value: 'createUserName', align: 'center', width: '200' },
-  { text: '更新时间', value: 'createTime', align: 'center', width: '200' },
+  { text: '更新时间', value: 'updateTime', align: 'center', width: '200' },
 ])
 const softwareList = ref<Array<ISoftwareInfo>>([]) // 表格数据
 
@@ -135,7 +135,7 @@
         <el-input v-model="searchQuery.softwareName" placeholder="软件名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.softwareVersion" placeholder="软件版本" clearable />
+        <el-input v-model="searchQuery.softwareVersion" placeholder="版本号" clearable />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
diff --git a/src/views/resource/software/review/approvedDetail.vue b/src/views/resource/software/review/approvedDetail.vue
new file mode 100644
index 0000000..d3d24f5
--- /dev/null
+++ b/src/views/resource/software/review/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 软件评审报告 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/softwareReport'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '软件评审报告.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '软件评审报告.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="软件评审报告">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index ce1065d..228bba1 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -548,6 +548,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'review-report-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'review-report-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'review-report-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/software/review/list.vue b/src/views/resource/software/review/list.vue
index a83a4c8..545b8c4 100644
--- a/src/views/resource/software/review/list.vue
+++ b/src/views/resource/software/review/list.vue
@@ -69,6 +69,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'review/detail',
   })
diff --git a/src/views/resource/software/revision/approvedDetail.vue b/src/views/resource/software/revision/approvedDetail.vue
new file mode 100644
index 0000000..bb28d50
--- /dev/null
+++ b/src/views/resource/software/revision/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 软件修订申请 -->
+<script name="FileRevisionApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/softwareRevision'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '软件修订申请.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '软件修订申请.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="软件修订申请">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/outsideService/service/approvedDetail.vue b/src/views/resource/outsideService/service/approvedDetail.vue
deleted file mode 100644
index c95d349..0000000
--- a/src/views/resource/outsideService/service/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="ServiceEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="外部服务评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/person/trainSign/detail.vue b/src/views/resource/person/trainSign/detail.vue
index aea4857..531612d 100644
--- a/src/views/resource/person/trainSign/detail.vue
+++ b/src/views/resource/person/trainSign/detail.vue
@@ -242,14 +242,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   const res = await getStream({ id: id.value, pdf: isPdf })
-  if (res.code === 200) {
-    stream.value = res.data
-    streamNormal.value = true
-  }
-  else {
-    ElMessage.warning('未获取到流文件，请联系管理员')
-    streamNormal.value = false
-  }
+  stream.value = res.data
   loading.close()
 }
 
diff --git a/src/views/resource/person/trainSign/list.vue b/src/views/resource/person/trainSign/list.vue
index 1da5a33..28a8ffd 100644
--- a/src/views/resource/person/trainSign/list.vue
+++ b/src/views/resource/person/trainSign/list.vue
@@ -1,11 +1,12 @@
 <!-- 培训签到表列表 -->
 <script name="TrainSignList" lang="ts" setup>
 import type { DateModelType } from 'element-plus'
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRegistrationForm, ISignListQuery } from './train-interface'
-import { deleteTrainSignInfo, getTrainSignList } from '@/api/resource/train'
+import { deleteTrainSignInfo, exportTrainList, getTrainSignList } from '@/api/resource/train'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 
 // 定义变量
 const { proxy } = getCurrentInstance() as any
@@ -33,11 +34,41 @@
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表头
 const list = ref([]) // 表格数据
+const checkoutList = ref([]) // 多选表格数据
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
 // 逻辑
 // 导出列表
 const batchExportList = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      fileCode: searchQuery.value.fileCode,
+      position: searchQuery.value.position,
+      host: searchQuery.value.host,
+      beginTime: searchQuery.value.beginTime,
+      endTime: searchQuery.value.endTime,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportTrainList(params).then((res) => {
+      const blob = new Blob([res.data])
+      loading.close()
+      exportFile(blob, '培训签到表.xlsx')
+    })
+  }
+  else {
+    loading.close()
+    ElMessage.warning('无数据可导出数据')
+  }
 }
 
 const addTrain = () => {
@@ -212,6 +243,7 @@
         :list-loading="loadingTable"
         :is-showmulti-select="true"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/software/info/detail.vue b/src/views/resource/software/info/detail.vue
index 60cdea7..1adf2b6 100644
--- a/src/views/resource/software/info/detail.vue
+++ b/src/views/resource/software/info/detail.vue
@@ -106,7 +106,7 @@
 
 // 编辑
 const updateById = () => {
-  updateSoftwareInfo(softwareInfo.value).then((res) => {
+  updateSoftwareInfo({ ...softwareInfo.value, updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss') }).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
diff --git a/src/views/resource/software/info/list.vue b/src/views/resource/software/info/list.vue
index a174c3c..73ab906 100644
--- a/src/views/resource/software/info/list.vue
+++ b/src/views/resource/software/info/list.vue
@@ -28,7 +28,7 @@
   { text: '软件名称', value: 'softwareName', align: 'center' },
   { text: '当前版本号', value: 'softwareVersion', align: 'center', width: '200' },
   { text: '创建人', value: 'createUserName', align: 'center', width: '200' },
-  { text: '更新时间', value: 'createTime', align: 'center', width: '200' },
+  { text: '更新时间', value: 'updateTime', align: 'center', width: '200' },
 ])
 const softwareList = ref<Array<ISoftwareInfo>>([]) // 表格数据
 
@@ -135,7 +135,7 @@
         <el-input v-model="searchQuery.softwareName" placeholder="软件名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.softwareVersion" placeholder="软件版本" clearable />
+        <el-input v-model="searchQuery.softwareVersion" placeholder="版本号" clearable />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
diff --git a/src/views/resource/software/review/approvedDetail.vue b/src/views/resource/software/review/approvedDetail.vue
new file mode 100644
index 0000000..d3d24f5
--- /dev/null
+++ b/src/views/resource/software/review/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 软件评审报告 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/softwareReport'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '软件评审报告.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '软件评审报告.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="软件评审报告">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index ce1065d..228bba1 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -548,6 +548,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'review-report-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'review-report-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'review-report-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/software/review/list.vue b/src/views/resource/software/review/list.vue
index a83a4c8..545b8c4 100644
--- a/src/views/resource/software/review/list.vue
+++ b/src/views/resource/software/review/list.vue
@@ -69,6 +69,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'review/detail',
   })
diff --git a/src/views/resource/software/revision/approvedDetail.vue b/src/views/resource/software/revision/approvedDetail.vue
new file mode 100644
index 0000000..bb28d50
--- /dev/null
+++ b/src/views/resource/software/revision/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 软件修订申请 -->
+<script name="FileRevisionApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/softwareRevision'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '软件修订申请.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '软件修订申请.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="软件修订申请">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/software/revision/detail.vue b/src/views/resource/software/revision/detail.vue
index 45c4d45..7e8c56e 100644
--- a/src/views/resource/software/revision/detail.vue
+++ b/src/views/resource/software/revision/detail.vue
@@ -461,6 +461,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'revision-report-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'revision-report-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'revision-report-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/outsideService/service/approvedDetail.vue b/src/views/resource/outsideService/service/approvedDetail.vue
deleted file mode 100644
index c95d349..0000000
--- a/src/views/resource/outsideService/service/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="ServiceEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="外部服务评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/person/trainSign/detail.vue b/src/views/resource/person/trainSign/detail.vue
index aea4857..531612d 100644
--- a/src/views/resource/person/trainSign/detail.vue
+++ b/src/views/resource/person/trainSign/detail.vue
@@ -242,14 +242,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   const res = await getStream({ id: id.value, pdf: isPdf })
-  if (res.code === 200) {
-    stream.value = res.data
-    streamNormal.value = true
-  }
-  else {
-    ElMessage.warning('未获取到流文件，请联系管理员')
-    streamNormal.value = false
-  }
+  stream.value = res.data
   loading.close()
 }
 
diff --git a/src/views/resource/person/trainSign/list.vue b/src/views/resource/person/trainSign/list.vue
index 1da5a33..28a8ffd 100644
--- a/src/views/resource/person/trainSign/list.vue
+++ b/src/views/resource/person/trainSign/list.vue
@@ -1,11 +1,12 @@
 <!-- 培训签到表列表 -->
 <script name="TrainSignList" lang="ts" setup>
 import type { DateModelType } from 'element-plus'
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRegistrationForm, ISignListQuery } from './train-interface'
-import { deleteTrainSignInfo, getTrainSignList } from '@/api/resource/train'
+import { deleteTrainSignInfo, exportTrainList, getTrainSignList } from '@/api/resource/train'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 
 // 定义变量
 const { proxy } = getCurrentInstance() as any
@@ -33,11 +34,41 @@
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表头
 const list = ref([]) // 表格数据
+const checkoutList = ref([]) // 多选表格数据
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
 // 逻辑
 // 导出列表
 const batchExportList = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      fileCode: searchQuery.value.fileCode,
+      position: searchQuery.value.position,
+      host: searchQuery.value.host,
+      beginTime: searchQuery.value.beginTime,
+      endTime: searchQuery.value.endTime,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportTrainList(params).then((res) => {
+      const blob = new Blob([res.data])
+      loading.close()
+      exportFile(blob, '培训签到表.xlsx')
+    })
+  }
+  else {
+    loading.close()
+    ElMessage.warning('无数据可导出数据')
+  }
 }
 
 const addTrain = () => {
@@ -212,6 +243,7 @@
         :list-loading="loadingTable"
         :is-showmulti-select="true"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/software/info/detail.vue b/src/views/resource/software/info/detail.vue
index 60cdea7..1adf2b6 100644
--- a/src/views/resource/software/info/detail.vue
+++ b/src/views/resource/software/info/detail.vue
@@ -106,7 +106,7 @@
 
 // 编辑
 const updateById = () => {
-  updateSoftwareInfo(softwareInfo.value).then((res) => {
+  updateSoftwareInfo({ ...softwareInfo.value, updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss') }).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
diff --git a/src/views/resource/software/info/list.vue b/src/views/resource/software/info/list.vue
index a174c3c..73ab906 100644
--- a/src/views/resource/software/info/list.vue
+++ b/src/views/resource/software/info/list.vue
@@ -28,7 +28,7 @@
   { text: '软件名称', value: 'softwareName', align: 'center' },
   { text: '当前版本号', value: 'softwareVersion', align: 'center', width: '200' },
   { text: '创建人', value: 'createUserName', align: 'center', width: '200' },
-  { text: '更新时间', value: 'createTime', align: 'center', width: '200' },
+  { text: '更新时间', value: 'updateTime', align: 'center', width: '200' },
 ])
 const softwareList = ref<Array<ISoftwareInfo>>([]) // 表格数据
 
@@ -135,7 +135,7 @@
         <el-input v-model="searchQuery.softwareName" placeholder="软件名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.softwareVersion" placeholder="软件版本" clearable />
+        <el-input v-model="searchQuery.softwareVersion" placeholder="版本号" clearable />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
diff --git a/src/views/resource/software/review/approvedDetail.vue b/src/views/resource/software/review/approvedDetail.vue
new file mode 100644
index 0000000..d3d24f5
--- /dev/null
+++ b/src/views/resource/software/review/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 软件评审报告 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/softwareReport'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '软件评审报告.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '软件评审报告.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="软件评审报告">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index ce1065d..228bba1 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -548,6 +548,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'review-report-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'review-report-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'review-report-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/software/review/list.vue b/src/views/resource/software/review/list.vue
index a83a4c8..545b8c4 100644
--- a/src/views/resource/software/review/list.vue
+++ b/src/views/resource/software/review/list.vue
@@ -69,6 +69,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'review/detail',
   })
diff --git a/src/views/resource/software/revision/approvedDetail.vue b/src/views/resource/software/revision/approvedDetail.vue
new file mode 100644
index 0000000..bb28d50
--- /dev/null
+++ b/src/views/resource/software/revision/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 软件修订申请 -->
+<script name="FileRevisionApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/softwareRevision'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '软件修订申请.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '软件修订申请.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="软件修订申请">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/software/revision/detail.vue b/src/views/resource/software/revision/detail.vue
index 45c4d45..7e8c56e 100644
--- a/src/views/resource/software/revision/detail.vue
+++ b/src/views/resource/software/revision/detail.vue
@@ -461,6 +461,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'revision-report-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'revision-report-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'revision-report-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/software/revision/list.vue b/src/views/resource/software/revision/list.vue
index 8e6ac67..4d06020 100644
--- a/src/views/resource/software/revision/list.vue
+++ b/src/views/resource/software/revision/list.vue
@@ -64,6 +64,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'revision/detail',
   })

diff --git a/src/api/business/fieldTest/record.ts b/src/api/business/fieldTest/record.ts
index d23976c..67f1afc 100644
--- a/src/api/business/fieldTest/record.ts
+++ b/src/api/business/fieldTest/record.ts
@@ -59,3 +59,13 @@
   })
 }
 
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/business/siteExecutive/log/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/business/manager/order.ts b/src/api/business/manager/order.ts
index 759aba9..fd338e3 100644
--- a/src/api/business/manager/order.ts
+++ b/src/api/business/manager/order.ts
@@ -6,7 +6,7 @@
 const prefix = '/business/order'
 
 // 列表查询
-export function getOrderList(data: IListQuery) {
+export function getOrderList(data: any) {
   return request({
     url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/equipment/source/resultComplete.ts b/src/api/equipment/source/resultComplete.ts
index 6040996..2116380 100644
--- a/src/api/equipment/source/resultComplete.ts
+++ b/src/api/equipment/source/resultComplete.ts
@@ -111,3 +111,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/equipment/trace/resultCompleteSituation/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/equipment/standard/book.ts b/src/api/equipment/standard/book.ts
index d746da7..bbec9b0 100644
--- a/src/api/equipment/standard/book.ts
+++ b/src/api/equipment/standard/book.ts
@@ -2,11 +2,10 @@
  * 标准装置台账管理接口
  */
 import request from '../../index'
-import type { IListQuery } from '@/views/equipement/standard/book/book-interface'
 const prefix = 'standard'
 
 // 列表查询
-export function getStandardList(data: IListQuery) {
+export function getStandardList(data: any) {
   return request({
     url: `${prefix}/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
     method: 'post',
diff --git a/src/api/resource/environment.ts b/src/api/resource/environment.ts
index 853e5f5..c191484 100644
--- a/src/api/resource/environment.ts
+++ b/src/api/resource/environment.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/environment/require/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/environmentTest.ts b/src/api/resource/environmentTest.ts
index cf2bab0..3eef69e 100644
--- a/src/api/resource/environmentTest.ts
+++ b/src/api/resource/environmentTest.ts
@@ -92,6 +92,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamResistance(data: any) {
+  return request({
+    url: '/resource/environment/resistance/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  供电电压测试记录 -------------------------------- */
 // 查询供电电压测试记录
 export function getVoltageRecordList(data: any) {
@@ -183,6 +193,16 @@
   })
 }
 
+// 导出word/pdf/打印--
+export function getStreamVoltage(data: any) {
+  return request({
+    url: '/resource/environment/voltage/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
 /* --------------------------------  UPS蓄电池内阻测试记录 -------------------------------- */
 // 查询UPS蓄电池内阻测试记录
 export function getUpsResistanceRecordList(data: any) {
@@ -273,3 +293,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStreamUpsResistance(data: any) {
+  return request({
+    url: '/resource/environment/ups/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/examine.ts b/src/api/resource/examine.ts
index f260482..2c6f0bb 100644
--- a/src/api/resource/examine.ts
+++ b/src/api/resource/examine.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--要求、委托书及合同评审表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/examine/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileArchive.ts b/src/api/resource/fileArchive.ts
index dadffa9..6749e80 100644
--- a/src/api/resource/fileArchive.ts
+++ b/src/api/resource/fileArchive.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/recallArchive/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/fileChange.ts b/src/api/resource/fileChange.ts
index ccadd16..6377803 100644
--- a/src/api/resource/fileChange.ts
+++ b/src/api/resource/fileChange.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/change/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileGrantNotice.ts b/src/api/resource/fileGrantNotice.ts
index 4e0f059..7cb7444 100644
--- a/src/api/resource/fileGrantNotice.ts
+++ b/src/api/resource/fileGrantNotice.ts
@@ -88,3 +88,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/grantNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/fileNovelty.ts b/src/api/resource/fileNovelty.ts
index 16bcfa0..399de03 100644
--- a/src/api/resource/fileNovelty.ts
+++ b/src/api/resource/fileNovelty.ts
@@ -88,3 +88,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/file/methodNoveltySearch/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 47874ea..60ebca8 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -115,3 +115,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--监测结果复查通知
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/reviewNotice/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/situationReport.ts b/src/api/resource/situationReport.ts
index 959e767..aea65b9 100644
--- a/src/api/resource/situationReport.ts
+++ b/src/api/resource/situationReport.ts
@@ -44,3 +44,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/situationReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/softwareReport.ts b/src/api/resource/softwareReport.ts
index 0ce1e9c..4058135 100644
--- a/src/api/resource/softwareReport.ts
+++ b/src/api/resource/softwareReport.ts
@@ -90,3 +90,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/reviewReport/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/softwareRevision.ts b/src/api/resource/softwareRevision.ts
index 8923e11..683b4b4 100644
--- a/src/api/resource/softwareRevision.ts
+++ b/src/api/resource/softwareRevision.ts
@@ -90,3 +90,12 @@
     data,
   })
 }
+// 导出word/pdf/打印
+export function getStream(data: any) {
+  return request({
+    url: '/resource/software/revisionApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/suggestForm.ts b/src/api/resource/suggestForm.ts
index ce83b27..9893873 100644
--- a/src/api/resource/suggestForm.ts
+++ b/src/api/resource/suggestForm.ts
@@ -117,3 +117,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--委托方意见登记表
+export function getStream(data: any) {
+  return request({
+    url: '/resource/customer/suggestForm/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 1143e9c..3c0b4fd 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -504,3 +504,66 @@
     data,
   })
 }
+
+// -------------------------------导出word、导出pdf、打印------------------------------------
+// 导出word/pdf/打印--易耗物资申请单
+export function getStreamConsumableApply(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsApply/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资验收记录
+export function getStreamConsumableCheck(data: any) {
+  return request({
+    url: '/resource/supplier/goodsAcceptanceRecord/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--物资入库单
+export function getStreamConsumableStore(data: any) {
+  return request({
+    url: '/resource/supplier/goodsWarehouse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资使用记录
+export function getStreamConsumableUse(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsUse/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--废弃物资处理交接记录
+export function getStreamConsumableHandover(data: any) {
+  return request({
+    url: '/resource/supplier/abandonGoodsHandle/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 导出word/pdf/打印--易耗物资供方评价表
+export function getStreamConsumableEvaluate(data: any) {
+  return request({
+    url: '/resource/supplier/consumableGoodsEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// -----------------------------------------------------------------------------------------
diff --git a/src/api/resource/supplierEquipment.ts b/src/api/resource/supplierEquipment.ts
index 0cd6231..147f387 100644
--- a/src/api/resource/supplierEquipment.ts
+++ b/src/api/resource/supplierEquipment.ts
@@ -1,3 +1,4 @@
+// 设备供方评价表
 import request from '../index'
 const prefix = 'resource/supplier/evaluate'
 
@@ -90,3 +91,14 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/evaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/api/resource/supplierService.ts b/src/api/resource/supplierService.ts
index 07dbf3e..bc62d2b 100644
--- a/src/api/resource/supplierService.ts
+++ b/src/api/resource/supplierService.ts
@@ -90,3 +90,13 @@
     data,
   })
 }
+
+// 导出word/pdf/打印--
+export function getStream(data: any) {
+  return request({
+    url: '/resource/supplier/serviceEvaluate/exportFile',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
diff --git a/src/api/resource/train.ts b/src/api/resource/train.ts
index 582a078..d66ed24 100644
--- a/src/api/resource/train.ts
+++ b/src/api/resource/train.ts
@@ -108,3 +108,13 @@
     data,
   })
 }
+
+// 导出列表
+export function exportTrainList(data: any) {
+  return request({
+    url: '/resource/registration/form/listExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index ee63b06..0b4c77e 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -376,6 +376,18 @@
           activeMenu: '/technology/noveltySearchList',
         },
       },
+      {
+        path: 'noveltySearch/approved/:id',
+        name: 'FileNoveltySearchDetailApproved',
+        component: () => import('@/views/resource/file/noveltySearch/approvedDetail.vue'),
+        meta: {
+          title: '测试校准检定方法查新记录表',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/technology/noveltySearchList',
+        },
+      },
     ],
   },
   {
@@ -585,7 +597,7 @@
       {
         path: 'revision/approved/:id?',
         name: 'RevisionApplyDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/revision/approvedDetail.vue'),
         meta: {
           title: '软件修订申请详情',
           icon: 'ep:key',
@@ -619,7 +631,7 @@
       {
         path: 'review/approved/:id?',
         name: 'ReviewReportDetailApproved',
-        component: () => import('@/views/resource/software/approvedDetail.vue'),
+        component: () => import('@/views/resource/software/review/approvedDetail.vue'),
         meta: {
           title: '软件评审报告详情',
           icon: 'ep:key',
@@ -660,7 +672,7 @@
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
-          activeMenu: '/environment/recordList',
+          activeMenu: '/environment/requireList',
         },
       },
       {
@@ -688,7 +700,7 @@
       {
         path: 'resistance/approved/:type?/:id?',
         name: 'EnvironmentResistanceDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/resistance/approvedDetail.vue'),
         meta: {
           title: '实验室接地电阻记录详情',
           icon: 'ep:key',
@@ -722,7 +734,7 @@
       {
         path: 'voltage/approved/:type?/:id?',
         name: 'EnvironmentVoltageDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/voltage/approvedDetail.vue'),
         meta: {
           title: '工作间供电电压记录详情',
           icon: 'ep:key',
@@ -756,7 +768,7 @@
       {
         path: 'ups/approved/:type?/:id?',
         name: 'EnvironmentUpsDetailApproved',
-        component: () => import('@/views/resource/environment/approvedDetail.vue'),
+        component: () => import('@/views/resource/environment/ups/approvedDetail.vue'),
         meta: {
           title: 'UPS蓄电池内阻测试记录详情',
           icon: 'ep:key',
@@ -765,16 +777,16 @@
           activeMenu: '/environment/upsResistanceList',
         },
       },
-      {
-        path: 'recordList',
-        name: 'EnvironmentRecordList',
-        component: () => import('@/views/resource/environment/record/list.vue'),
-        meta: {
-          title: '环境记录单',
-          auth: '/resource/environment/record',
-          icon: 'ep:key',
-        },
-      },
+      // {
+      //   path: 'recordList',
+      //   name: 'EnvironmentRecordList',
+      //   component: () => import('@/views/resource/environment/record/list.vue'),
+      //   meta: {
+      //     title: '环境记录单',
+      //     auth: '/resource/environment/record',
+      //     icon: 'ep:key',
+      //   },
+      // },
       {
         path: 'setting',
         name: 'EnvironmentSetting',
@@ -857,7 +869,7 @@
       {
         path: 'service/approved/:id?',
         name: 'ServiceEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/service/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/serviceEvaluate.vue'),
         meta: {
           title: '外部服务评价表详情',
           icon: 'ep:key',
@@ -891,7 +903,7 @@
       {
         path: 'equipment/approved/:id?',
         name: 'EquipmentEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/equipment/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue'),
         meta: {
           title: '设备供方评价表详情',
           icon: 'ep:key',
@@ -925,7 +937,7 @@
       {
         path: 'consumableApply/approved/:type?/:id?',
         name: 'ConsumableApplyDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableApply.vue'),
         meta: {
           title: '易耗物资申请单详情',
           icon: 'ep:key',
@@ -959,7 +971,7 @@
       {
         path: 'consumableCheck/approved/:id?',
         name: 'ConsumableCheckDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableCheck.vue'),
         meta: {
           title: '物资验收记录详情',
           icon: 'ep:key',
@@ -993,7 +1005,7 @@
       {
         path: 'consumableStore/approved/:type?/:id?',
         name: 'ConsumableStoreDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableStore.vue'),
         meta: {
           title: '物资入库单详情',
           icon: 'ep:key',
@@ -1027,7 +1039,7 @@
       {
         path: 'consumable/approved/:id?',
         name: 'ConsumableUseDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableUse.vue'),
         meta: {
           title: '易耗物资使用记录详情',
           icon: 'ep:key',
@@ -1083,7 +1095,7 @@
       {
         path: 'consumable/supplier/approved/:id?',
         name: 'ConsumableEvaluateDetailApproved',
-        component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+        component: () => import('@/views/resource/outsideService/approvedDetail/consumableEvaluate.vue'),
         meta: {
           title: '易耗物资供方评价表详情',
           icon: 'ep:key',
diff --git a/src/views/business/certManage/apply/dialog/selectCertDialog.vue b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
index c3e9141..acb39ee 100644
--- a/src/views/business/certManage/apply/dialog/selectCertDialog.vue
+++ b/src/views/business/certManage/apply/dialog/selectCertDialog.vue
@@ -195,7 +195,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
index 370d9cd..e2b5f02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectCustomerDialog.vue
@@ -168,7 +168,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
index 3a10299..e9a33b2 100644
--- a/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectEquipmentDialog.vue
@@ -228,7 +228,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
index 000e558..e6a7e02 100644
--- a/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
+++ b/src/views/business/fieldTest/approve/dialog/selectStaffDialog.vue
@@ -123,7 +123,6 @@
         is-showmulti-select
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/fieldTest/record/detail.vue b/src/views/business/fieldTest/record/detail.vue
index f0b64af..f8e2a78 100644
--- a/src/views/business/fieldTest/record/detail.vue
+++ b/src/views/business/fieldTest/record/detail.vue
@@ -1,12 +1,20 @@
-<!-- 现场检测记录表详情 -->
-<script name="FieldTestRecordDetailDoc" lang="ts" setup>
+<!-- 现场测试、校准或检定工作记录表 -->
+<script name="FieldTestApproveDetailDoc" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getStream } from '@/api/business/fieldTest/record'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,49 +28,73 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-// 编辑
-const edit = () => {
-  $router.replace({
-    path: `/fieldTest/record/edit/${infoId.value}`,
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '现场测试、校准或检定工作记录表.doc')
+    loading.close()
   })
 }
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '现场测试、校准或检定工作记录表.pdf')
+}
+
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="测试、校准或检定工作分包评审表">
+    <detail-page v-loading="loading" title="现场测试、校准或检定工作记录表">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
-        <el-button type="primary" @click="edit">
-          编辑
-        </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
index c826380..332b35a 100644
--- a/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
+++ b/src/views/business/fieldTest/record/dialog/selectFieldTestApprove.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
index d57d8fc..c8b6440 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectEquipment.vue
@@ -188,7 +188,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [10, 20, 30, 50, 100, 150, 200, 300] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
index 1a950e1..33a7daa 100644
--- a/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
+++ b/src/views/business/manager/interchangeReceipt/dialog/selectOrderDialog.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectCustomer.vue b/src/views/business/manager/order/dialog/selectCustomer.vue
index c348275..ee9508d 100644
--- a/src/views/business/manager/order/dialog/selectCustomer.vue
+++ b/src/views/business/manager/order/dialog/selectCustomer.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectEquipment.vue b/src/views/business/manager/order/dialog/selectEquipment.vue
index d67834c..7169582 100644
--- a/src/views/business/manager/order/dialog/selectEquipment.vue
+++ b/src/views/business/manager/order/dialog/selectEquipment.vue
@@ -174,7 +174,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
index 8d66562..a874326 100644
--- a/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
+++ b/src/views/business/manager/order/dialog/selectFieldTestApprovalDialog.vue
@@ -158,7 +158,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/manager/sendReceive/components/certificate.vue b/src/views/business/manager/sendReceive/components/certificate.vue
index 4a3b0d5..4dc2332 100644
--- a/src/views/business/manager/sendReceive/components/certificate.vue
+++ b/src/views/business/manager/sendReceive/components/certificate.vue
@@ -101,7 +101,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/manager/sendReceive/components/certificationMonitor.vue b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
index e3d411e..db074c4 100644
--- a/src/views/business/manager/sendReceive/components/certificationMonitor.vue
+++ b/src/views/business/manager/sendReceive/components/certificationMonitor.vue
@@ -108,7 +108,7 @@
       :columns="columns"
       :list-loading="loading"
       :pagination="true"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200]"
       @change="changePage"
     >
       <template #preColumns>
diff --git a/src/views/business/manager/sendReceive/components/measureItem.vue b/src/views/business/manager/sendReceive/components/measureItem.vue
index 754334a..6e5568b 100644
--- a/src/views/business/manager/sendReceive/components/measureItem.vue
+++ b/src/views/business/manager/sendReceive/components/measureItem.vue
@@ -254,6 +254,9 @@
               loading.close()
             })
           }
+          else {
+            loading.close()
+          }
         })
       })
     }
@@ -270,265 +273,268 @@
 </script>
 
 <template>
-  <div v-for="(item, index) in itemList" :key="index">
-    <detail-block title="检定项信息">
-      <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
-        <el-row :gutter="24">
-          <el-col :span="8">
-            <el-form-item label="设备分类:">
-              <el-input
-                v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="检校标准装置:">
-              <el-input
-                v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
-                disabled class="input"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备检定项分类:">
-              <el-input
-                v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
-                class="input"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+  <div v-if="itemList.every((item: any) => item.id && item.itemCategoryName && item.belongStandardEquipment)">
+    <div v-for="(item, index) in itemList" :key="index">
+      <detail-block title="检定项信息">
+        <el-form ref="ruleFormRef" :model="item" label-width="120" label-position="right" style="margin-bottom: 20px;">
+          <el-row :gutter="24">
+            <el-col :span="8">
+              <el-form-item label="设备分类:">
+                <el-input
+                  v-model="item.deviceTypeName" :placeholder="pageType === 'detail' ? ' ' : '设备分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="检校标准装置:">
+                <el-input
+                  v-model="item.belongStandardEquipmentName" :placeholder="pageType === 'detail' ? ' ' : '检校标准装置'"
+                  disabled class="input"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="设备检定项分类:">
+                <el-input
+                  v-model="item.itemCategoryName" :placeholder="pageType === 'detail' ? ' ' : '设备检定项分类'" disabled
+                  class="input"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
 
-      <!-- 第一套：多功能校准源标准装置--字典：1 -->
-      <el-checkbox
-        v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
-        style="margin-left: 20px;" disabled
-      >
-        外观及功能检查
-      </el-checkbox>
-      <!-- 检定项表格(增加行模式) -->
-      <template-detail-add-row-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <!-- 检定项表格(生成检定点模式) -->
-      <template-detail-create-pattern
-        v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
-        :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
-      />
-      <template-detail-third
-        v-if="item.belongStandardEquipment === '3'" page-type="detail"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
-      />
-      <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
-      <template-detail-second
-        v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          voltageRegulation: item.voltageRegulation,
-          loadRegulation: item.loadRegulation,
-          voltageRepresentError: item.voltageRepresentError,
-          currentRepresentErrorDirect: item.currentRepresentErrorDirect,
-          currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
-          rippleVoltage: item.rippleVoltage,
-          voltageOutputStability: item.voltageOutputStability,
-          itemRemark: item.itemRemark,
-        }"
-      />
-      <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
-      <template-detail-fourth
-        v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
-        :form="getObject"
-      />
+        <!-- 第一套：多功能校准源标准装置--字典：1 -->
+        <el-checkbox
+          v-if="item.belongStandardEquipment === '1'" v-model="item.appearanceFunctionCheck"
+          style="margin-left: 20px;" disabled
+        >
+          外观及功能检查
+        </el-checkbox>
+        <!-- 检定项表格(增加行模式) -->
+        <template-detail-add-row-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '数字多用表(手持)' || item.itemCategoryName === '数字多用表(台式)' || item.itemCategoryName === '多功能电力参数测量仪' || item.itemCategoryName === '钳形电流表' || item.itemCategoryName === '指针式万用表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <!-- 检定项表格(生成检定点模式) -->
+        <template-detail-create-pattern
+          v-if="item.belongStandardEquipment === '1' && item.itemCategoryName === '交流电压表' || item.itemCategoryName === '交流电流表' || item.itemCategoryName === '直流电压表' || item.itemCategoryName === '直流电流表' || item.itemCategoryName === '75mV电流表'"
+          :list="item.detailList" page-type="detail" :item-category-name="item.itemCategoryName"
+        />
+        <template-detail-third
+          v-if="item.belongStandardEquipment === '3'" page-type="detail"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{ appearanceFunctionCheck: item.appearanceFunctionCheck }"
+        />
+        <!-- 第二套: 直流稳压电源标准装置--字典：2 -->
+        <template-detail-second
+          v-if="item.belongStandardEquipment === '2'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            voltageRegulation: item.voltageRegulation,
+            loadRegulation: item.loadRegulation,
+            voltageRepresentError: item.voltageRepresentError,
+            currentRepresentErrorDirect: item.currentRepresentErrorDirect,
+            currentRepresentErrorIndirect: item.currentRepresentErrorIndirect,
+            rippleVoltage: item.rippleVoltage,
+            voltageOutputStability: item.voltageOutputStability,
+            itemRemark: item.itemRemark,
+          }"
+        />
+        <!-- 第四套: 0.02级活塞式压力计标准装置--字典：4 -->
+        <template-detail-fourth
+          v-if="item.belongStandardEquipment === '4'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" page-type="detail"
+          :form="getObject"
+        />
 
-      <!-- 第5套: 二等铂标准装置--字典：5 -->
-      <template-detail-fifth
-        v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          angleAdjustError: item.angleAdjustError,
-          indicationError: item.indicationError,
-          insulateResistance: item.insulateResistance,
-          waveEvenTest: item.waveEvenTest,
-        }" page-type="detail"
-      />
-      <!-- 第6套: 安全阀标准装置--字典：6 -->
+        <!-- 第5套: 二等铂标准装置--字典：5 -->
+        <template-detail-fifth
+          v-if="item.belongStandardEquipment === '5'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            angleAdjustError: item.angleAdjustError,
+            indicationError: item.indicationError,
+            insulateResistance: item.insulateResistance,
+            waveEvenTest: item.waveEvenTest,
+          }" page-type="detail"
+        />
+        <!-- 第6套: 安全阀标准装置--字典：6 -->
 
-      <template-detail-sixth
-        v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          sealingTest: item.sealingTest,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第8套: E2等砝码标准装置--字典：8 -->
-      <template-detail-eighth
-        v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          localIndicationError: item.localIndicationError,
-          partialLoadError: item.partialLoadError,
-          repeatability: item.repeatability,
-        }" page-type="detail"
-      />
-      <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
-      <template-detail-ninth
-        v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck,
-          frequencyDisplay: item.frequencyDisplay,
-          sweepWidth: item.sweepWidth,
-          middleFrequencyWidth: item.middleFrequencyWidth,
-          middleConversionDeviation: item.middleConversionDeviation,
-          referenceLevel: item.referenceLevel,
-          verticalScale: item.verticalScale,
-          inputFrequency: item.inputFrequency,
-          averageNoiseLevel: item.averageNoiseLevel,
-          harmonicDistortion: item.harmonicDistortion,
-          inputAttenuation: item.inputAttenuation,
-          gainCompression: item.gainCompression,
-          calibratingSignal: item.calibratingSignal,
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第10套: 信号发生器--字典：10 -->
-      <template-detail-tenth
-        v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          frequency: item.frequency, //	频率
-          power: item.power, // 功率
-          amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
-          frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
-          remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
-          remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
-          harmonic: item.harmonic, //	谐波
-          phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
-          noHarmonic: item.noHarmonic, //	非谐波
-        }" page-type="detail"
-      />
-      <!-- 第11套: 微波衰减--字典：11  -->
-      <template-detail-eleventh
-        v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          attenuationAmount: item.attenuationAmount, //	衰减量
-          itemRemark: item.itemRemark,
-        }" page-type="detail"
-      />
-      <!-- 第13套: 示波器检定装置--字典：13 -->
-      <template-detail-thirteenth
-        v-if="item.belongStandardEquipment === '13'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          timeBase: item.timeBase, //	时基(示波器-数字)
-          scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
-          bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
-          calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
-          currentBias: item.currentBias, //	直流偏置(示波器-数字)
-          currentGain: item.currentGain, //	直流增益(示波器-数字)
-          inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
-          riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
-          triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
-          triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
-          verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
-        }" page-type="detail"
-      />
+        <template-detail-sixth
+          v-if="item.belongStandardEquipment === '6'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            sealingTest: item.sealingTest,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第8套: E2等砝码标准装置--字典：8 -->
+        <template-detail-eighth
+          v-if="item.belongStandardEquipment === '8'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            localIndicationError: item.localIndicationError,
+            partialLoadError: item.partialLoadError,
+            repeatability: item.repeatability,
+          }" page-type="detail"
+        />
+        <!-- 第9套: 频谱分析仪标准装置--字典：9 -->
+        <template-detail-ninth
+          v-if="item.belongStandardEquipment === '9'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck,
+            frequencyDisplay: item.frequencyDisplay,
+            sweepWidth: item.sweepWidth,
+            middleFrequencyWidth: item.middleFrequencyWidth,
+            middleConversionDeviation: item.middleConversionDeviation,
+            referenceLevel: item.referenceLevel,
+            verticalScale: item.verticalScale,
+            inputFrequency: item.inputFrequency,
+            averageNoiseLevel: item.averageNoiseLevel,
+            harmonicDistortion: item.harmonicDistortion,
+            inputAttenuation: item.inputAttenuation,
+            gainCompression: item.gainCompression,
+            calibratingSignal: item.calibratingSignal,
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第10套: 信号发生器--字典：10 -->
+        <template-detail-tenth
+          v-if="item.belongStandardEquipment === '10'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            frequency: item.frequency, //	频率
+            power: item.power, // 功率
+            amplitudeModulationDepth: item.amplitudeModulationDepth, // 调幅深度
+            frequencyModulationDeviation: item.frequencyModulationDeviation, //	调频频偏
+            remainAmplitudeModulation: item.remainAmplitudeModulation, //	剩余调幅
+            remainFrequencyModulation: item.remainFrequencyModulation, //	剩余调频
+            harmonic: item.harmonic, //	谐波
+            phaseModulationPhaseDeviation: item.phaseModulationPhaseDeviation, //	调相相偏
+            noHarmonic: item.noHarmonic, //	非谐波
+          }" page-type="detail"
+        />
+        <!-- 第11套: 微波衰减--字典：11  -->
+        <template-detail-eleventh
+          v-if="item.belongStandardEquipment === '11'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            attenuationAmount: item.attenuationAmount, //	衰减量
+            itemRemark: item.itemRemark,
+          }" page-type="detail"
+        />
+        <!-- 第13套: 示波器检定装置--字典：13 -->
+        <template-detail-thirteenth
+          v-if="item.belongStandardEquipment === '13'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            timeBase: item.timeBase, //	时基(示波器-数字)
+            scanTimeCoefficient: item.scanTimeCoefficient, // 扫描时间系数及扩展(示波器-模拟)
+            bandWidth: item.bandWidth, // 频带宽度(示波器-数字/模拟)
+            calibratingSignal: item.calibratingSignal, //	校准信号(示波器-数字/模拟)
+            currentBias: item.currentBias, //	直流偏置(示波器-数字)
+            currentGain: item.currentGain, //	直流增益(示波器-数字)
+            inputResistance: item.inputResistance, //	输入电阻(示波器-数字/模拟)
+            riseTime: item.riseTime, //	上升时间(示波器-数字/模拟)
+            triggerCharacter: item.triggerCharacter, //	触发特性(示波器-模拟)
+            triggerSensitivity: item.triggerSensitivity, //	触发灵敏度(示波器-数字)
+            verticalAmplitude: item.verticalAmplitude, // 垂直幅度(示波器-模拟)
+          }" page-type="detail"
+        />
 
-      <!-- 第14套: 铯原子--字典：14 -->
-      <template-detail-fourteen
-        v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
-          secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
-          frequencyStability: item.frequencyStability, // 频率稳定度
-          relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
-          frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
-          dailyAgingRate: item.dailyAgingRate, // 日老化率
-          outputSignal: item.outputSignal, // 输出信号
-          warmUp: item.warmUp, // 开机特性
-          dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
-          frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
-          frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
-          crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
-          crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
-          crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
-          crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
-          crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
-          timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
-          periodicMeasureError: item.periodicMeasureError, // 周期测量误差
-          periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
-        }" page-type="detail"
-      />
-      <!-- 第15套: 小功率--字典：15 -->
-      <template-detailfifteenth
-        v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-        }" page-type="detail"
-      />
+        <!-- 第14套: 铯原子--字典：14 -->
+        <template-detail-fourteen
+          v-if="item.belongStandardEquipment === '14'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequencySignalOutputAmplitude: item.frequencySignalOutputAmplitude, // 频率信号输出幅度
+            secondPulseOutput: item.secondPulseOutput, // 秒脉冲输出
+            frequencyStability: item.frequencyStability, // 频率稳定度
+            relativeFrequencyDeviation: item.relativeFrequencyDeviation, // 相对频率偏差
+            frequencyReproducibility: item.frequencyReproducibility, // 频率复现性
+            dailyAgingRate: item.dailyAgingRate, // 日老化率
+            outputSignal: item.outputSignal, // 输出信号
+            warmUp: item.warmUp, // 开机特性
+            dailyFrequencyDriftRate: item.dailyFrequencyDriftRate, // 日频率漂移率
+            frequencyMeasureError: item.frequencyMeasureError, // 频率测量误差
+            frequencyMeasureRange: item.frequencyMeasureRange, // 频率测量范围、输入灵敏度
+            crystalOscillatorDailyAgingRate: item.crystalOscillatorDailyAgingRate, // 晶振日老化率
+            crystalOscillatorReproducibility: item.crystalOscillatorReproducibility, // 晶振频率复现性
+            crystalOscillatorDeviation: item.crystalOscillatorDeviation, // 晶振相对频率偏差
+            crystalOscillatorStability: item.crystalOscillatorStability, // 晶振1s频率稳定度
+            crystalOscillatorStartupCharacter: item.crystalOscillatorStartupCharacter, // 晶振开机特性
+            timeIntervalMeasureRange: item.timeIntervalMeasureRange, // 时间间隔测量范围及测量误差
+            periodicMeasureError: item.periodicMeasureError, // 周期测量误差
+            periodicMeasureRange: item.periodicMeasureRange, // 周期测量范围、输入灵敏度
+          }" page-type="detail"
+        />
+        <!-- 第15套: 小功率--字典：15 -->
+        <template-detailfifteenth
+          v-if="item.belongStandardEquipment === '15'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+          }" page-type="detail"
+        />
 
-      <!-- 第16套: 低频信号源--字典：16 -->
-      <template-detail-sixteen
-        v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
-        :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          itemRemark: item.itemRemark,
-          frequency: item.frequency, // 频率
-          acVoltage: item.acVoltage, // 交流电压
-          dcVoltage: item.dcVoltage, // 直流电压
-          riseTime: item.riseTime, // 上升时间
-          sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
-          harmonicDistortion: item.harmonicDistortion, // 总谐波失真
-        }" page-type="detail"
-      />
-      <!-- 第17套: 小功率--字典：17 -->
-      <template-detail-seventeen
-        v-if="item.belongStandardEquipment === '17'"
-        :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
-        :list="item.detailList" :form="{
-          appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
-          vswr: item.vswr, //	电压驻波比
-          insertionLoss: item.insertionLoss, // 插入损耗
-          isolationDegree: item.isolationDegree, // 隔离度
-          gainFlatness: item.gainFlatness, //	增益、增益平坦度
-          couplingDirection: item.couplingDirection, //	耦合度、方向性
-          amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
-          phaseShift: item.phaseShift, //	相移
-          phaseConsistency: item.phaseConsistency, //	相位一致性
-          groupDelay: item.groupDelay, //	群时延
-          filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
-          pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
-          powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
-          spuriousSuppression: item.spuriousSuppression, //	杂散抑制
-          harmonicDistortion: item.harmonicDistortion, //	谐波失真
-          phaseNoise: item.phaseNoise, //	相位噪声
-          transferAmplitude: item.transferAmplitude, //	传输幅度
-          transferPhaseShift: item.transferPhaseShift, //	传输相移
-        }" page-type="detail"
-      />
+        <!-- 第16套: 低频信号源--字典：16 -->
+        <template-detail-sixteen
+          v-if="item.belongStandardEquipment === '16'" :item-category-name="item.itemCategoryName"
+          :belong-standard-equipment="item.belongStandardEquipment" :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            itemRemark: item.itemRemark,
+            frequency: item.frequency, // 频率
+            acVoltage: item.acVoltage, // 交流电压
+            dcVoltage: item.dcVoltage, // 直流电压
+            riseTime: item.riseTime, // 上升时间
+            sinusoidFlatness: item.sinusoidFlatness, // 正弦信号平坦度
+            harmonicDistortion: item.harmonicDistortion, // 总谐波失真
+          }" page-type="detail"
+        />
+        <!-- 第17套: 小功率--字典：17 -->
+        <template-detail-seventeen
+          v-if="item.belongStandardEquipment === '17'"
+          :item-category-name="item.itemCategoryName" :belong-standard-equipment="item.belongStandardEquipment"
+          :list="item.detailList" :form="{
+            appearanceFunctionCheck: item.appearanceFunctionCheck, // 外观及功能性检查
+            vswr: item.vswr, //	电压驻波比
+            insertionLoss: item.insertionLoss, // 插入损耗
+            isolationDegree: item.isolationDegree, // 隔离度
+            gainFlatness: item.gainFlatness, //	增益、增益平坦度
+            couplingDirection: item.couplingDirection, //	耦合度、方向性
+            amplitudeConsistency: item.amplitudeConsistency, //	幅度一致性
+            phaseShift: item.phaseShift, //	相移
+            phaseConsistency: item.phaseConsistency, //	相位一致性
+            groupDelay: item.groupDelay, //	群时延
+            filterCharacter: item.filterCharacter, //	滤波器特性(3dB截止频率、通带宽度、通带频响、通带插损、阻带衰减及矩形系数)
+            pointOutputPowerLevel: item.pointOutputPowerLevel, //	1dB压缩点输出功率电平
+            powerFlatness: item.powerFlatness, //	输出功率、功率平坦度
+            spuriousSuppression: item.spuriousSuppression, //	杂散抑制
+            harmonicDistortion: item.harmonicDistortion, //	谐波失真
+            phaseNoise: item.phaseNoise, //	相位噪声
+            transferAmplitude: item.transferAmplitude, //	传输幅度
+            transferPhaseShift: item.transferPhaseShift, //	传输相移
+          }" page-type="detail"
+        />
 
-      <!-- 检定项备注 -->
-      <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="检定项备注:">
-              <el-input
-                v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
-                :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-block>
+        <!-- 检定项备注 -->
+        <el-form :model="item" label-width="120" label-position="right" style="margin-top: 20px;">
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="检定项备注:">
+                <el-input
+                  v-model="item.itemRemark" class="full-width-input" autosize type="textarea"
+                  :placeholder="pageType === 'detail' ? ' ' : '检定项备注'" :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block>
+    </div>
   </div>
+  <el-empty v-else :image-size="100" description="暂无数据" />
 </template>
diff --git a/src/views/business/manager/sendReceive/dialog/selectStaff.vue b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
index d6b473d..3dc2153 100644
--- a/src/views/business/manager/sendReceive/dialog/selectStaff.vue
+++ b/src/views/business/manager/sendReceive/dialog/selectStaff.vue
@@ -188,7 +188,6 @@
             :query="listQuery"
             :list-loading="loading"
             :is-showmulti-select="multi"
-            :page-sizes="[5]"
             @change="changePage"
             @multi-select="multiSelect"
           >
diff --git a/src/views/business/measure/item/components/fourth/templateDetail.vue b/src/views/business/measure/item/components/fourth/templateDetail.vue
index 9b85352..a704e94 100644
--- a/src/views/business/measure/item/components/fourth/templateDetail.vue
+++ b/src/views/business/measure/item/components/fourth/templateDetail.vue
@@ -419,61 +419,7 @@
       <el-checkbox v-model="form.zeroDrift" :false-label="0" :true-label="1" :disabled="pageType === 'detail' || props.itemCategoryName !== '数字压力计'">
         零位漂移
       </el-checkbox><br>
-      <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
-        设定点偏差及切换差
-      </el-checkbox><br>
-      <el-form
-        ref="ruleFormDeviationAndSwitchingRef"
-        :model="form"
-        label-width="130"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
-          <el-col :span="6">
-            <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueOne"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueTwo" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueTwo"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
-              </div>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="showValueThree" :span="6">
-            <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
-              <div style="display: flex;flex-wrap: nowrap;">
-                <el-input
-                  v-model="form.displayValueThree"
-                  :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
-                  :disabled="pageType === 'detail'"
-                  :class="{ 'detail-input': pageType === 'detail' }"
-                  style="flex: 1;"
-                />
-                <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form><br>
+
       <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表' || props.itemCategoryName === '一般压力表' || props.itemCategoryName === '精密压力表'" v-model="form.indicationError" :false-label="0" :true-label="1" disabled>
         示值误差、回程误差、轻敲位移
       </el-checkbox>
@@ -725,6 +671,61 @@
         </el-col> -->
       </el-row>
     </el-form>
+    <el-checkbox v-if="props.itemCategoryName === '电接点一般压力表'" v-model="form.deviationAndSwitching" :false-label="0" :true-label="1" :disabled="pageType === 'detail'">
+      设定点偏差及切换差
+    </el-checkbox><br>
+    <el-form
+      ref="ruleFormDeviationAndSwitchingRef"
+      :model="form"
+      label-width="130"
+      label-position="right"
+      :rules="rules"
+    >
+      <el-row v-if="props.itemCategoryName === '电接点一般压力表' && form.deviationAndSwitching" :gutter="24" style="margin-top: 20px;">
+        <el-col :span="8">
+          <el-form-item label-width="140" label="设定标准器示值1:" prop="displayValueOne">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueOne"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueTwo && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueTwo" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值2:" prop="displayValueTwo">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueTwo"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" />
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="showValueThree" :span="8">
+          <el-form-item label-width="140" label="设定标准器示值3:" prop="displayValueThree">
+            <div style="display: flex;flex-wrap: nowrap;">
+              <el-input
+                v-model="form.displayValueThree"
+                :placeholder="pageType === 'detail' ? '' : '请设定标准器示值'"
+                :disabled="pageType === 'detail'"
+                :class="{ 'detail-input': pageType === 'detail' }"
+                style="flex: 1;"
+              />
+              <!-- <icon-button v-if="!showValueThree && pageType !== 'detail'" style="margin-left: 10px;" size="20" icon="icon-add" title="新建" type="primary" @click="addValue" /> -->
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form><br>
 
     <detail-block :title="props.pageType !== 'detail' ? ' ' : ''">
       <template v-if="props.pageType !== 'detail'" #btns>
diff --git a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
index cb2d28e..865ba05 100644
--- a/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
+++ b/src/views/business/measure/item/dialog/quoteTemplateListDialog.vue
@@ -240,7 +240,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/directories/components/ability.vue b/src/views/business/subpackage/directories/components/ability.vue
index f23def0..ebcae74 100644
--- a/src/views/business/subpackage/directories/components/ability.vue
+++ b/src/views/business/subpackage/directories/components/ability.vue
@@ -163,7 +163,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/directories/components/person.vue b/src/views/business/subpackage/directories/components/person.vue
index e51d463..5c55b77 100644
--- a/src/views/business/subpackage/directories/components/person.vue
+++ b/src/views/business/subpackage/directories/components/person.vue
@@ -169,7 +169,7 @@
     <el-pagination
       style="width: 100%;margin-top: 10px;"
       :current-page="listQuery.offset"
-      :page-sizes="[10, 20, 30]"
+      :page-sizes="[5, 10, 20, 30, 50, 100, 150, 200, 300]"
       :page-size="listQuery.limit"
       :total="total"
       layout="total, sizes, prev, pager, next"
diff --git a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
index a2c199e..b325963 100644
--- a/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
+++ b/src/views/business/subpackage/inform/dialog/selectReviewDialog.vue
@@ -176,7 +176,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
index 9cd49f5..06b125e 100644
--- a/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectOutsourcerNoDialog.vue
@@ -166,7 +166,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
index aacec5f..df575a8 100644
--- a/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
+++ b/src/views/business/subpackage/review/dialog/selectReceivedEquipmentDialog.vue
@@ -175,7 +175,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="[5, 10, 20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
index 78e20a6..11d3076 100644
--- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
+++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue
@@ -429,8 +429,8 @@
           params: '校准信号',
           itemType: item.itemType, // 项目
           nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值
-          topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值
-          bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值
+          topMeasureValue: item.itemType === '频率' ? '-' : item.topMeasureValue, // 顶部测量值
+          bottomMeasureValue: item.itemType === '频率' ? '-' : item.bottomMeasureValue, // 底部测量值
         }
       })
       itemFormData.value.calibratingSignal = calibratingSignalList.value.length > 0 ? 1 : 0
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
index d7389ca..1ed033c 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog.vue
@@ -273,7 +273,6 @@
             :is-multi="true"
             :height="416"
             :pagination="false"
-            :page-sizes="[20]"
             @change="changePage"
             @multi-select="handleSelectionChange"
           >
diff --git a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
index a01ea8a..42e8192 100644
--- a/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
+++ b/src/views/business/taskMeasure/measureData/dialog/selectStandardDialog2.vue
@@ -180,7 +180,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="360"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
index 4db85cc..6476c5a 100644
--- a/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
+++ b/src/views/equipement/info/book/dialog/selectUnpackRecordDialog.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/resume/encasement/edit.vue b/src/views/equipement/resume/encasement/edit.vue
index ef61a60..2141566 100644
--- a/src/views/equipement/resume/encasement/edit.vue
+++ b/src/views/equipement/resume/encasement/edit.vue
@@ -216,15 +216,6 @@
   $router.back()
 }
 
-// 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
-
-// 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
-
-// 打印
-const print = () => { ElMessage.info('敬请期待') }
-
 // 点击编辑按钮
 const edit = () => {
   pageType.value = 'edit'
@@ -265,6 +256,7 @@
         addResumeEncasementList(params).then((res) => {
           ElMessage.success('保存成功')
           form.value.formNo = res.data // 记录表单号
+          infoId.value = res.data.id // id
           pageType.value = 'detail'
           loading.close()
         }).catch(() => {
diff --git a/src/views/equipement/resume/week/components/templateDetail.vue b/src/views/equipement/resume/week/components/templateDetail.vue
index 8884fbc..fcd41fe 100644
--- a/src/views/equipement/resume/week/components/templateDetail.vue
+++ b/src/views/equipement/resume/week/components/templateDetail.vue
@@ -281,126 +281,128 @@
 </script>
 
 <template>
-  <app-container v-loading="loading">
-    <detail-page :title="`${props.title}-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
-          导出word
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
-          导出pdf
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="print">
-          打印
-        </el-button>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
-          保存
-        </el-button>
-        <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
-          编辑
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="form"
-        label-width="120"
-        label-position="right"
-        :rules="formRules"
-      >
-        <el-row :gutter="24">
-          <el-col :span="6">
-            <el-form-item label="记录编号:" prop="logNo">
-              <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录名称:" prop="logName">
-              <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录部门:" prop="deptName">
-              <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录人:" prop="createUserName">
-              <el-input
-                v-model="form.createUserName"
-                class="full-width-input"
-                :placeholder="pageType === 'detail' ? '' : '记录人'"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间:" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                type="datetime"
-                format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                class="full-width-input"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24">
-          <el-col :span="12">
-            <el-form-item label="备注:" prop="remark">
-              <el-input
-                v-model="form.remark"
-                class="full-width-input"
-                autosize
-                type="textarea"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="维护保养信息">
-      <el-table
-        ref="techRef"
-        :data="list"
-        border
-        style="width: 100%;"
-      >
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          :width="item.width"
-          align="center"
+  <div class="week-month-tenplate-detail">
+    <app-container v-loading="loading">
+      <detail-page :title="`${props.title}-${textMap[pageType]}`">
+        <template #btns>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportWord">
+            导出word
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="exportPdf">
+            导出pdf
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="print">
+            打印
+          </el-button>
+          <el-button v-if="pageType !== 'detail'" type="primary" @click="save">
+            保存
+          </el-button>
+          <el-button v-if="pageType === 'detail'" type="primary" @click="edit">
+            编辑
+          </el-button>
+          <el-button type="info" @click="close">
+            关闭
+          </el-button>
+        </template>
+        <el-form
+          ref="ruleFormRef"
+          :model="form"
+          label-width="120"
+          label-position="right"
+          :rules="formRules"
         >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
-              <el-radio label="1">
-                正常
-              </el-radio>
-              <el-radio label="0">
-                不正常
-              </el-radio>
-            </el-radio-group>
-            <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
-            <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
-            <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-            <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="记录编号:" prop="logNo">
+                <el-input v-model="form.logNo" class="full-width-input" disabled placeholder="系统自动生成" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录名称:" prop="logName">
+                <el-input v-model="form.logName" class="full-width-input" :disabled="pageType === 'detail'" placeholder="请输入记录名称" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录部门:" prop="deptName">
+                <el-input v-model="form.deptName" class="full-width-input" disabled placeholder="记录部门" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录人:" prop="createUserName">
+                <el-input
+                  v-model="form.createUserName"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '记录人'"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="记录时间:" prop="createTime">
+                <el-date-picker
+                  v-model="form.createTime"
+                  type="datetime"
+                  format="YYYY-MM-DD HH:mm:ss"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  class="full-width-input"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="12">
+              <el-form-item label="备注:" prop="remark">
+                <el-input
+                  v-model="form.remark"
+                  class="full-width-input"
+                  autosize
+                  type="textarea"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-page>
+      <detail-block title="维护保养信息">
+        <el-table
+          ref="techRef"
+          :data="list"
+          border
+          style="width: 100%;"
+        >
+          <el-table-column align="center" label="序号" width="80" type="index" />
+          <el-table-column
+            v-for="item in columns"
+            :key="item.value"
+            :prop="item.value"
+            :label="item.text"
+            :width="item.width"
+            align="center"
+          >
+            <template #header>
+              <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+            </template>
+            <template #default="scope">
+              <el-radio-group v-if="pageType !== 'detail' && item.value === 'result'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'">
+                <el-radio label="1">
+                  正常
+                </el-radio>
+                <el-radio label="0">
+                  不正常
+                </el-radio>
+              </el-radio-group>
+              <span v-if="pageType === 'detail' && item.value === 'result'">{{ scope.row.result === '1' ? '正常' : scope.row.result === '0' ? '不正常' : '未知' }}</span>
+              <span v-if="scope.row.result === '1' && item.value === 'reason'">{{ scope.row.normalContent }}</span>
+              <el-input v-if="pageType !== 'detail' && scope.row.result === '0' && item.value === 'reason'" v-model="scope.row[item.value]" autosize type="textarea" :autofocus="true" :placeholder="`${item.text}`" class="input" />
+              <span v-if="item.value !== 'result' && item.value !== 'reason'" style="white-space: pre-wrap;">{{ scope.row[item.value] }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </detail-block>
+    </app-container>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -415,9 +417,10 @@
 </style>
 
 <style lang="scss">
-.fieldtest-record-detail {
-  .el-table thead.is-group th.el-table__cell {
-    background: #f2f6ff;
+.week-month-tenplate-detail {
+  .el-radio__label {
+    display: block !important;
   }
 }
 </style>
+
diff --git a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
index 4e35d83..bbb4578 100644
--- a/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
+++ b/src/views/equipement/source/plan/dialog/selectSourceDialog.vue
@@ -164,7 +164,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/source/resultComplete/detail.vue b/src/views/equipement/source/resultComplete/detail.vue
index 51fa0e6..65566e5 100644
--- a/src/views/equipement/source/resultComplete/detail.vue
+++ b/src/views/equipement/source/resultComplete/detail.vue
@@ -1,12 +1,20 @@
-<!-- 溯源结果完成情况详情 -->
-<script name="EquipmentResultCompleteDetail" lang="ts" setup>
+<!-- 溯源结果完成情况 -->
+<script name="EquipmentResumeEncasementDetail" lang="ts" setup>
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import filePreview from '@/components/filePreview/index.vue'
+import * as pdfjsLib from 'pdfjs-dist'
+import filePreview from '@/components/filePreview/filePreview.vue'
+import { getBase64, getObjectURL } from '@/utils/download'
+import { exportFile } from '@/utils/exportUtils'
+import { getStream } from '@/api/equipment/source/resultComplete'
+import { printPdf } from '@/utils/printUtils'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const printFileName = ref('') // 文件名
 const $route = useRoute()
 const $router = useRouter()
+const fromPage = ref('') // 来源页面、
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // --------------------------------------路由参数----------------------------------------------
 // 从路由中获取页面类型参数
 if ($route.params) {
@@ -20,31 +28,64 @@
   $router.back()
 }
 // 导出word
-const exportWord = () => { ElMessage.info('敬请期待') }
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '溯源结果完成情况.doc')
+    loading.close()
+  })
+}
 
 // 导出pdf
-const exportPdf = () => { ElMessage.info('敬请期待') }
+const exportPdf = () => {
+  exportFile(pdfStream.value, '溯源结果完成情况.pdf')
+}
 
 // 打印
-const print = () => { ElMessage.info('敬请期待') }
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -----------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
 // -----------------------------------------钩子--------------------------------------------------
-
 onMounted(() => {
-
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page v-loading="loading" title="溯源结果确认">
+    <detail-page v-loading="loading" title="溯源结果完成情况">
       <template #btns>
-        <el-button type="primary" @click="exportWord">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportWord">
           导出word
         </el-button>
-        <el-button type="primary" @click="exportPdf">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="exportPdf">
           导出pdf
         </el-button>
-        <el-button type="primary" @click="print">
+        <el-button v-if="fromPage !== 'equipment'" type="primary" @click="print">
           打印
         </el-button>
         <el-button type="info" @click="close">
@@ -52,9 +93,8 @@
         </el-button>
       </template>
     </detail-page>
-    <!-- <file-preview :print-file-name="printFileName" /> -->
-    <div style="text-align: center;margin-top: 50px;font-weight: 600;">
-      敬请期待
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
     </div>
   </app-container>
 </template>
diff --git a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
index ff90780..456018a 100644
--- a/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
+++ b/src/views/equipement/source/resultComplete/dialog/selectResultConfirmDialog.vue
@@ -167,7 +167,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
index 2478758..3d659d1 100644
--- a/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectBuildStandardDialog.vue
@@ -160,7 +160,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
index 85b633b..b12d045 100644
--- a/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectEquipmentDialog.vue
@@ -189,7 +189,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectPerson.vue b/src/views/equipement/standard/book/dialog/selectPerson.vue
index 8e9b2d9..8ad9b83 100644
--- a/src/views/equipement/standard/book/dialog/selectPerson.vue
+++ b/src/views/equipement/standard/book/dialog/selectPerson.vue
@@ -122,7 +122,6 @@
         :is-multi="false"
         :list-loading="loadingTable"
         :height="260"
-        :page-sizes="[20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
index 685fce6..d65f66c 100644
--- a/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
+++ b/src/views/equipement/standard/book/dialog/selectSysDocDialog.vue
@@ -163,7 +163,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/book/dialog/selectTechFiles.vue b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
index 04c2667..eec8e96 100644
--- a/src/views/equipement/standard/book/dialog/selectTechFiles.vue
+++ b/src/views/equipement/standard/book/dialog/selectTechFiles.vue
@@ -157,7 +157,6 @@
         :list-loading="loadingTable"
         :is-multi="isMulti"
         :height="260"
-        :page-sizes="isMulti ? [20] : [5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
index fd6bc95..71bea7b 100644
--- a/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
+++ b/src/views/equipement/standard/build/dialog/selectFileTemplateDialog.vue
@@ -173,7 +173,6 @@
         :list-loading="loadingTable"
         :is-multi="false"
         :height="260"
-        :page-sizes="[5]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
index 4cb2e1c..987630b 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardDialog.vue
@@ -42,15 +42,16 @@
 const list = ref([]) // 表格数据
 const total = ref(0)
 const columns = ref<TableColumn[]>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
-  { text: '测量范围', value: 'measureRange', align: 'center' },
-  { text: '不确定度或允许误差极限或准确度等级', value: 'uncertainty', align: 'center' },
-  { text: '建标日期', value: 'date', align: 'center', width: '120' },
-  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
-  { text: '检定或校准项目', value: 'measureItem', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ])
 const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
 
@@ -178,7 +179,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
index 5b01392..4376d4d 100644
--- a/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
+++ b/src/views/equipement/standardStateMaintenance/dialog/selectStandardEquipmentDialog.vue
@@ -207,7 +207,6 @@
         :list-loading="loadingTable"
         :is-multi="props.isMulti"
         :height="260"
-        :page-sizes="props.isMulti ? [5] : [20]"
         @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/quality/meeting/components/userDialog.vue b/src/views/quality/meeting/components/userDialog.vue
index 7f66977..a00743a 100644
--- a/src/views/quality/meeting/components/userDialog.vue
+++ b/src/views/quality/meeting/components/userDialog.vue
@@ -145,7 +145,7 @@
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
-        :data="list" :total="total" :columns="columns" :query="listQuery" :page-sizes="[5, 20, 50]"
+        :data="list" :total="total" :columns="columns" :query="listQuery"
         :list-loading="loadingTable" :is-showmulti-select="true" :is-multi="true" @change="changePage"
         @multi-select="handleSelectionChange"
       >
diff --git a/src/views/resource/common/filterStandard.vue b/src/views/resource/common/filterStandard.vue
index ea696ed..8cdbf83 100644
--- a/src/views/resource/common/filterStandard.vue
+++ b/src/views/resource/common/filterStandard.vue
@@ -16,21 +16,40 @@
 
 const showFilterDialog = ref(false)
 const listQuery = ref<IListQuery>({
-  approvalStatus: '0', // 审批状态
-  deptId: '', // 部门id
-  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // formid
-  standardName: '', // 标准装置名称
-  storageLocation: '', // 存放地点
-  technologyFileName: '', // 依据的技术文件
+  approvalStatus: '0', //	审批状态类型code，导出接口不用传
+  deptId: '', //		部门id
+  formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+  groupCode: '', // 	组别代码
+  inUseStatus: '', //	在用状态
+  labCode: '', //	实验室名称
+  lastChangeDateStart: '', //	最近变更日期开始
+  lastChangeDateEnd: '', //	最近变更日期结束
+  lastReviewDateStart: '', //	最近复查日期开始
+  lastReviewDateEnd: '', //	最近复查日期结束
+  nextReviewDateStart: '', //	下次复查日期开始
+  nextReviewDateEnd: '', //	下次复查日期结束
+  majorType: '', //	专业类别
+  standardName: '', //	计量标准装置名称
+  standardNo: '', //	计量标准证书号
+  storageLocation: '', //	存放地点(字典code)
+  technologyFileName: '', //	依据技术文件名称
+  // groupeCode: '',
   offset: 1,
-  limit: 10,
+  limit: 20,
 })
 const total = ref<number>(0) // 数据总条数
+const tableLoading = ref(false)
 const columns = ref <Array<TableColumn>>([
-  { text: '标准代码', value: 'standardNo', align: 'center' },
-  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
-  { text: '存放地点', value: 'storageLocationName', align: 'center' },
   { text: '计量标准证书号', value: 'standardCertNo', align: 'center' },
+  { text: '计量标准装置名称', value: 'standardName', align: 'center' },
+  { text: '实验室', value: 'labCodeName', align: 'center', width: '120' },
+  { text: '部门', value: 'groupCodeName', align: 'center', width: '120' },
+  { text: '专业类别', value: 'majorTypeName', align: 'center', width: '120' },
+  { text: '最近复查日期', value: 'lastReviewDate', align: 'center', width: '120' },
+  { text: '下次复查日期', value: 'nextReviewDate', align: 'center', width: '120' },
+  { text: '在用状态', value: 'manageStatusName', align: 'center' },
+  { text: '最近变更日期', value: 'lastChangeDate', align: 'center', width: '120' },
+  { text: '标准证书', value: 'standardCertFile', align: 'center' },
 ]) // 表头
 
 const list = ref<Array<IStandardForm>>([])
@@ -55,6 +74,7 @@
 
 // 查询设备列表
 const getList = () => {
+  tableLoading.value = true
   getStandardList(listQuery.value).then((res) => {
     if (res.code === 200) {
       list.value = res.data.rows
@@ -63,6 +83,7 @@
     else {
       list.value = []
     }
+    tableLoading.value = false
   })
 }
 
@@ -98,22 +119,45 @@
   emit('recordSelected', row)
 }
 
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: '0', //	审批状态类型code，导出接口不用传
+    deptId: '', //		部门id
+    formId: SCHEDULE.STANDARD_BOOK_APPROVAL, // 表单id（流程定义对应的表单id，等价于业务id），导出接口不用传
+    groupCode: '', // 	组别代码
+    inUseStatus: '', //	在用状态
+    labCode: '', //	实验室名称
+    lastChangeDateStart: '', //	最近变更日期开始
+    lastChangeDateEnd: '', //	最近变更日期结束
+    lastReviewDateStart: '', //	最近复查日期开始
+    lastReviewDateEnd: '', //	最近复查日期结束
+    nextReviewDateStart: '', //	下次复查日期开始
+    nextReviewDateEnd: '', //	下次复查日期结束
+    majorType: '', //	专业类别
+    standardName: '', //	计量标准装置名称
+    standardNo: '', //	计量标准证书号
+    storageLocation: '', //	存放地点(字典code)
+    technologyFileName: '', //	依据技术文件名称
+    offset: 1,
+    limit: 20,
+  }
+  getList()
+}
+
 defineExpose({
   showOrHideFilterDialog,
 })
 </script>
 
 <template>
-  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
-    <search-area :need-clear="false" @search="getList">
+  <el-dialog v-model="showFilterDialog" title="选择标准装置" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="75%">
+    <search-area :need-clear="true" @search="getList()" @clear="clearList">
       <search-item>
-        <el-input v-model="listQuery.standardName" placeholder="标准装置名称" clearable />
+        <el-input v-model.trim="listQuery.standardNo" placeholder="计量标准证书号" class="short-input" clearable />
       </search-item>
-
       <search-item>
-        <el-select v-model="listQuery.storageLocation" placeholder="存放地点" class="short-input" clearable>
-          <el-option v-for="item in storageLocationDict" :key="item.id" :label="item.name" :value="item.value" />
-        </el-select>
+        <el-input v-model.trim="listQuery.standardName" placeholder="计量标准装置名称" class="short-input" clearable />
       </search-item>
     </search-area>
 
@@ -121,9 +165,9 @@
     <table-container :title-show="false">
       <!-- 表格区域 -->
       <normal-table
-        :data="list" :total="total" :columns="columns"
-        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
-        @change="changePage"
+        v-loading="tableLoading" :data="list" :total="total"
+        :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/customer/examine/approvedDetail.vue b/src/views/resource/customer/examine/approvedDetail.vue
index 3d98291..5fcf78f 100644
--- a/src/views/resource/customer/examine/approvedDetail.vue
+++ b/src/views/resource/customer/examine/approvedDetail.vue
@@ -1,76 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="ExamineDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-import { sendTo } from '@/api/resource/examine'
-import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
+<!-- 要求、委托书及合同评审表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/examine'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
-const customerId = ref<string>('')
-const signUserId = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const refCustomerStaffFilter = ref()
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('examineInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '要求、委托书及合同评审表.doc')
+    loading.close()
+  })
 }
 
-// 点击 发送 按钮
-const sendToCustomer = () => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(true)
-}
-
-const sysUserSelectedHandler = (row: any) => {
-  refCustomerStaffFilter.value.showOrHideFilterDialog(false)
-
-  if (row.id !== '') {
-    customerId.value = row.deptId // 委托方表中的deptId
-    signUserId.value = row.id // 委托方签名人员id（发送给委托方要进行签名的人员id，系统用户表中的userId）
-
-    sendTo({ id: id.value, customerId: customerId.value, signUserId: signUserId.value }).then((res) => {
-      if (res.code === 200) {
-        // 提示保存成功
-        ElMessage.success(`审批表发送到 ${row.customerName} 的 ${row.name} 成功`)
-      }
-      else {
-        // 提示失败信息
-        ElMessage.error(`审批表发送至受检单位失败：${res.message}`)
-      }
-    })
-  }
-  else {
-    ElMessage.error('发送给委托方人员不能为空，请重新选择')
-  }
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '要求、委托书及合同评审表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -78,25 +71,22 @@
   <app-container>
     <detail-page title="要求、委托书及合同评审表">
       <template #btns>
-        <el-button type="primary" @click="sendToCustomer">
-          发送给委托方
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-
-    <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/info/basicForEdit.vue b/src/views/resource/customer/info/basicForEdit.vue
index 95a7573..637c414 100644
--- a/src/views/resource/customer/info/basicForEdit.vue
+++ b/src/views/resource/customer/info/basicForEdit.vue
@@ -44,7 +44,7 @@
   deptId: [{ required: true, message: '委托方名称不能为空', trigger: 'blur' }],
   customerLocation: [{ required: true, message: '委托方所属地不能为空，请选择', trigger: ['change', 'blur'] }],
   contacts: [{ required: true, message: '联系人不能为空', trigger: 'blur' }],
-  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur', validator: mobileValidator }],
+  mobile: [{ required: true, message: '座机电话不能为空', trigger: 'blur' }, { validator: mobileValidator, trigger: 'blur' }],
   phone: [{ message: '请输入符合规范的手机号码', trigger: 'blur', validator: phoneValidator }],
   postalCode: [{ message: '邮政编码为6位数字', trigger: 'blur', validator: postalCodeValidator }],
   address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
diff --git a/src/views/resource/customer/info/customer-info.ts b/src/views/resource/customer/info/customer-info.ts
index d23fe4c..336db59 100644
--- a/src/views/resource/customer/info/customer-info.ts
+++ b/src/views/resource/customer/info/customer-info.ts
@@ -65,7 +65,7 @@
     callback()
   }
   else {
-    callback(new Error('验证失败'))
+    callback(new Error('座机格式验证失败'))
   }
 }
 
diff --git a/src/views/resource/customer/info/detail.vue b/src/views/resource/customer/info/detail.vue
index 30912e5..581b947 100644
--- a/src/views/resource/customer/info/detail.vue
+++ b/src/views/resource/customer/info/detail.vue
@@ -24,8 +24,8 @@
 const radioItems = ref([
   { name: '基本信息', value: 'customer-basic' },
   { name: '委托方人员', value: 'customer-staff' },
-  { name: '任务单信息', value: 'customer-order' },
-  { name: '证书报告', value: 'customer-report' },
+  // { name: '任务单信息', value: 'customer-order' },
+  // { name: '证书报告', value: 'customer-report' },
   { name: '审批详情', value: 'customer-approval' },
 ])
 
@@ -324,6 +324,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 新建草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'customer-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非新建、非草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'customer-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'customer-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDialog(route.query)
 })
diff --git a/src/views/resource/customer/info/list.vue b/src/views/resource/customer/info/list.vue
index ff23c55..0c6fa02 100644
--- a/src/views/resource/customer/info/list.vue
+++ b/src/views/resource/customer/info/list.vue
@@ -66,6 +66,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'info/detail',
   })
diff --git a/src/views/resource/customer/reviewNotice/approvedDetail.vue b/src/views/resource/customer/reviewNotice/approvedDetail.vue
index 1840151..65b556a 100644
--- a/src/views/resource/customer/reviewNotice/approvedDetail.vue
+++ b/src/views/resource/customer/reviewNotice/approvedDetail.vue
@@ -1,10 +1,18 @@
 <!-- 复检通知书详情 -->
 <script name="NoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ICustomerNoticeInfo } from './customer-notice'
-import { exportFile, sendTo } from '@/api/resource/reviewNotice'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream, sendTo } from '@/api/resource/reviewNotice'
 import FilterCustomerStaff from '@/views/resource/common/filterCustomerStaff.vue'
 
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 // 从路由中传过来的参数
 const id = ref<string>('')
 const noticeInfo = ref<ICustomerNoticeInfo>({
@@ -74,19 +82,28 @@
   }
 }
 
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
 }
 
-// 打印PDF
-const printToPDF = () => {
-
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
 
 const initDialog = (params: any) => {
@@ -94,6 +111,26 @@
   id.value = params.id !== undefined ? params.id : ''
 
   noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+  init()
+}
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: id.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
@@ -108,16 +145,15 @@
         <el-button type="primary" @click="sendToCustomer">
           发送给委托方
         </el-button>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
         <el-button type="info" @click="resetForm()">
           关闭
         </el-button>
@@ -125,5 +161,8 @@
     </detail-page>
 
     <filter-customer-staff ref="refCustomerStaffFilter" title="请选择委托方和签收人员" @record-selected="sysUserSelectedHandler" />
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/customer/situationReport/detail.vue b/src/views/resource/customer/situationReport/detail.vue
index 8841568..da01033 100644
--- a/src/views/resource/customer/situationReport/detail.vue
+++ b/src/views/resource/customer/situationReport/detail.vue
@@ -1,16 +1,17 @@
 <!-- 委托方情况报告详情 -->
 <script name="SituationReportDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { ICustomerQuestionnaireInfo, IListQuery } from '../questionnaire/customer-questionnaire'
 import type { ICustomerSatisfaction, ISituationReportInfo } from './customer-report'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
 import useUserStore from '@/store/modules/user'
-import { detailSituationReport, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
+import { detailSituationReport, getStream, saveSituationReport, updateSituationReport } from '@/api/resource/situationReport'
 import { getDictByCode } from '@/api/system/dict'
 import { getQuestionnaireList } from '@/api/resource/questionnaire'
 import FilterQuestionnaire from '@/views/resource/common/filterQuestionnaire.vue'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
@@ -75,23 +76,6 @@
 const customerSelectedXc = ref<ICustomerSatisfaction[]>([])
 const customerSelectedHk = ref<ICustomerSatisfaction[]>([])
 
-// 逻辑
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-// 打印通知
-const printReport = () => {
-
-}
-
 const xcMultiSelect = (e: any) => {
   customerSelectedXc.value = e
 }
@@ -330,6 +314,49 @@
   }
 })
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -348,7 +375,7 @@
             <el-button type="primary" @click="printToPDF">
               导出PDF
             </el-button>
-            <el-button type="primary" @click="printReport">
+            <el-button type="primary" @click="printClickedHandler">
               打印
             </el-button>
           </template>
diff --git a/src/views/resource/customer/suggestForm/approvedDetail.vue b/src/views/resource/customer/suggestForm/approvedDetail.vue
index 5ac027f..c02754d 100644
--- a/src/views/resource/customer/suggestForm/approvedDetail.vue
+++ b/src/views/resource/customer/suggestForm/approvedDetail.vue
@@ -1,42 +1,69 @@
-<!-- 意见登记表详情 -->
-<script name="SuggestFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 委托方意见登记表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/suggestForm'
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-const route = useRoute()
-const router = useRouter()
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '委托方意见登记表.doc')
+    loading.close()
+  })
+}
 
-// 逻辑
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('suggestFormInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '委托方意见登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -44,20 +71,22 @@
   <app-container>
     <detail-page title="委托方意见登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/environment/approvedDetail.vue b/src/views/resource/environment/approvedDetail.vue
deleted file mode 100644
index 5e0e7e5..0000000
--- a/src/views/resource/environment/approvedDetail.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<!-- 环境数据管理 审批通过详情查看 -->
-<script name="EnvironmentDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const type = ref<string>('')
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-const title = ref('')
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  type.value = params.type !== undefined ? params.type : ''
-  id.value = params.id !== undefined ? params.id : ''
-
-  switch (type.value) {
-    case 'resistance':
-      title.value = '实验室接地电阻记录'
-      break
-
-    case 'voltage' :
-      title.value = '工作间供电电压记录'
-      break
-
-    case 'ups' :
-      title.value = 'UPS蓄电池内阻测试记录'
-      break
-  }
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="title">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/environment/require/conditionDialog.vue b/src/views/resource/environment/require/conditionDialog.vue
index 74a7e96..ef65c87 100644
--- a/src/views/resource/environment/require/conditionDialog.vue
+++ b/src/views/resource/environment/require/conditionDialog.vue
@@ -43,8 +43,8 @@
 const conditionRules = ref({
   params: [{ required: true, message: '量传参数不能为空', trigger: 'blur' }],
   environmentRequire: [{ required: true, message: '环境条件要求不能为空', trigger: 'blur' }],
-  environmentAccord: [{ required: true, message: '环境条件依据不能为空，请选择', trigger: ['blur', 'change'] }],
-  fileId: [{ trigger: ['blur', 'change'], validator: checkMethodFile }],
+  environmentAccord: [{ required: true, message: '环境条件依据不能为空', trigger: ['blur', 'change'] }],
+  fileId: [{ required: true, message: '现行技术规范不能为空', trigger: ['blur', 'change'] }, { trigger: ['blur', 'change'], validator: checkMethodFile }],
 }) // 表单验证规则
 
 const showDialog = ref(false)
diff --git a/src/views/resource/environment/require/detail.vue b/src/views/resource/environment/require/detail.vue
index ffdc6fd..2124fd7 100644
--- a/src/views/resource/environment/require/detail.vue
+++ b/src/views/resource/environment/require/detail.vue
@@ -1,15 +1,16 @@
 <!-- 工作间环境条件要求 详情 -->
 <script name="EnvironmentRequireDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConditionRequire, IWorkRoomRequireInfo } from './require-confition-interface'
 import ConditionDialog from './conditionDialog.vue'
 import type { IStandardForm } from '@/views/resource/common/filterStandard.vue'
 import FilterStandard from '@/views/resource/common/filterStandard.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailEnvRequire, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
+import { detailEnvRequire, getStream, saveEnvRequire, updateEnvRequire } from '@/api/resource/environment'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
-
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 // 变量
 // 从路由中传过来的参数
 const type = ref<string>('')
@@ -22,7 +23,10 @@
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
-
+const rules = ref({
+  standardEquipmentName: [{ required: true, message: '标准名称不能为空', trigger: ['change', 'blur'] }],
+  workRoom: [{ required: true, message: '工作间名称不能为空', trigger: ['change', 'blur'] }],
+}) // 表单验证规则
 // 子组件
 const conditionsRef = ref()
 const conditionDialogRef = ref()
@@ -147,7 +151,7 @@
   if (!conditionsRef) { return }
 
   if (condList.value.length === 0) {
-    ElMessage.error('要求一览表不能为空')
+    ElMessage.warning('要求一览表不能为空')
     return
   }
 
@@ -235,21 +239,6 @@
   standardFilterRef.value.showOrHideFilterDialog(false)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getEnvironmentAccord = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizEnvironmentAccord') === null || sessionStorage.getItem('bizEnvironmentAccord') === undefined) {
@@ -324,6 +313,49 @@
   }
 }
 
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '委托方意见登记表.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '委托方意见登记表.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
@@ -332,7 +364,7 @@
 
 <template>
   <app-container>
-    <el-form ref="conditionsRef" :model="detailRequire" label-position="right" label-width="110px" border stripe>
+    <el-form ref="conditionsRef" :model="detailRequire" :rules="rules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
           <template v-if="type === 'detail'">
@@ -363,10 +395,10 @@
           <!-- 第一行 第一列 -->
           <el-col :span="6">
             <el-form-item label="文件编号">
-              <el-input v-model="detailRequire.formNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              <el-input v-model="detailRequire.formNo" placeholder="系统自动生成" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="工作间">
+            <el-form-item label="工作间名称" prop="workRoom">
               <el-input v-model="detailRequire.workRoom" placeholder="请输入工作间名称" :disabled="keyFieldsDisable" />
             </el-form-item>
           </el-col>
@@ -376,7 +408,7 @@
               <el-input v-model="detailRequire.formName" :disabled="true" />
             </el-form-item>
 
-            <el-form-item label="标准名称">
+            <el-form-item label="标准名称" prop="standardEquipmentName">
               <el-input v-model="detailRequire.standardEquipmentName" placeholder="请选择标准装置" :disabled="true">
                 <template v-if="type !== 'detail'" #append>
                   <el-button size="small" @click="showStandardEquipmentFilter">
diff --git a/src/views/resource/environment/resistance/approvedDetail.vue b/src/views/resource/environment/resistance/approvedDetail.vue
new file mode 100644
index 0000000..4ada15a
--- /dev/null
+++ b/src/views/resource/environment/resistance/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 实验室接地电阻记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '实验室接地电阻记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '实验室接地电阻记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="实验室接地电阻记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/resistance/detail.vue b/src/views/resource/environment/resistance/detail.vue
index f12db49..690e9c8 100644
--- a/src/views/resource/environment/resistance/detail.vue
+++ b/src/views/resource/environment/resistance/detail.vue
@@ -407,6 +407,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'resistance-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'resistance-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'resistance-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/resistance/list.vue b/src/views/resource/environment/resistance/list.vue
index a245b85..e288a46 100644
--- a/src/views/resource/environment/resistance/list.vue
+++ b/src/views/resource/environment/resistance/list.vue
@@ -62,6 +62,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'resistance/detail',
   })
@@ -372,7 +373,7 @@
                 查看
               </el-button>
 
-              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm(`/resource/environment/resistance/del`)" size="small" type="danger" link @click="deleteById(row)">
+              <el-button v-if="(active === '1' || active === '6')" size="small" type="danger" link @click="deleteById(row)">
                 删除
               </el-button>
 
diff --git a/src/views/resource/environment/ups/approvedDetail.vue b/src/views/resource/environment/ups/approvedDetail.vue
new file mode 100644
index 0000000..55f7a17
--- /dev/null
+++ b/src/views/resource/environment/ups/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- UPS蓄电池内阻测试记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamUpsResistance as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, 'UPS蓄电池内阻测试记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, 'UPS蓄电池内阻测试记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="UPS蓄电池内阻测试记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/approvedDetail.vue b/src/views/resource/environment/voltage/approvedDetail.vue
new file mode 100644
index 0000000..873113f
--- /dev/null
+++ b/src/views/resource/environment/voltage/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 工作间供电电压记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamVoltage as getStream } from '@/api/resource/environmentTest'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '工作间供电电压记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '工作间供电电压记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="工作间供电电压记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/environment/voltage/detail.vue b/src/views/resource/environment/voltage/detail.vue
index c34f769..75f8ff6 100644
--- a/src/views/resource/environment/voltage/detail.vue
+++ b/src/views/resource/environment/voltage/detail.vue
@@ -409,6 +409,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'voltage-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'voltage-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'voltage-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/environment/voltage/list.vue b/src/views/resource/environment/voltage/list.vue
index 007aadf..6e0bf83 100644
--- a/src/views/resource/environment/voltage/list.vue
+++ b/src/views/resource/environment/voltage/list.vue
@@ -80,6 +80,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'voltage/detail',
   })
diff --git a/src/views/resource/file/approval/detail.vue b/src/views/resource/file/approval/detail.vue
index 5a9c34a..86945c8 100644
--- a/src/views/resource/file/approval/detail.vue
+++ b/src/views/resource/file/approval/detail.vue
@@ -442,6 +442,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'approval-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'approval-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'approval-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/approval/list.vue b/src/views/resource/file/approval/list.vue
index e9a3152..8225218 100644
--- a/src/views/resource/file/approval/list.vue
+++ b/src/views/resource/file/approval/list.vue
@@ -57,6 +57,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'approval/detail',
   })
@@ -79,16 +80,17 @@
 const detail = (row: IFileApprovalForm) => {
   sessionStorage.setItem('fileApprovalForm', JSON.stringify(row))
 
-  if (active.value === '0') {
-    // 全部时 查看和打印文件流
-    router.push({
-      query: {
-        id: row.id,
-      },
-      path: 'approval/approved/detail',
-    })
-  }
-  else if (active.value === '1') {
+  // if (active.value === '0') {
+  //   // 全部时 查看和打印文件流
+  //   router.push({
+  //     query: {
+  //       id: row.id,
+  //     },
+  //     path: 'approval/approved/detail',
+  //   })
+  // }
+  // else if (active.value === '1') {
+  if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
diff --git a/src/views/resource/file/change/approvedDetail.vue b/src/views/resource/file/change/approvedDetail.vue
index a3f7070..86eaf08 100644
--- a/src/views/resource/file/change/approvedDetail.vue
+++ b/src/views/resource/file/change/approvedDetail.vue
@@ -1,41 +1,68 @@
 <!-- 意见登记表详情 -->
 <script name="FileChangeFormDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileChange'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件更改申请单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件更改申请单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件更改申请单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/change/detail.vue b/src/views/resource/file/change/detail.vue
index 5e8701c..d153b75 100644
--- a/src/views/resource/file/change/detail.vue
+++ b/src/views/resource/file/change/detail.vue
@@ -1,4 +1,4 @@
-<!-- 委托方意见登记表详情 -->
+<!-- 文件更改申请单详情 -->
 <script name="FileChangeFormDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IFileChangeForm, IFileChangeInfo } from './change-interface'
@@ -10,8 +10,9 @@
 import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
 import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
+
 import { getDictByCode } from '@/api/system/dict'
-import { detailFileChangeForm, failUpdateChangeForm, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
+import { detailFileChangeForm, failUpdateChangeForm, getStream, refuseApproval, revokeApproval, revokeDelete, saveChangeForm, submitChangeForm, updateDraftChangeForm } from '@/api/resource/fileChange'
 const $route = useRoute()
 
 // 从路由中传过来的参数
@@ -492,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'change-form-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'change-form-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'change-form-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/change/list.vue b/src/views/resource/file/change/list.vue
index 8cae1f9..ff57def 100644
--- a/src/views/resource/file/change/list.vue
+++ b/src/views/resource/file/change/list.vue
@@ -54,6 +54,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'change/detail',
   })
diff --git a/src/views/resource/file/grantNotice/approvedDetail.vue b/src/views/resource/file/grantNotice/approvedDetail.vue
index ace4c1a..31fdf60 100644
--- a/src/views/resource/file/grantNotice/approvedDetail.vue
+++ b/src/views/resource/file/grantNotice/approvedDetail.vue
@@ -1,41 +1,68 @@
-<!-- 意见登记表详情 -->
-<script name="FileGrantNoticeDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件发放通知单 -->
+<script name="FileChangeFormDetailApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileGrantNotice'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件发放通知单.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件发放通知单.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
@@ -43,20 +70,22 @@
   <app-container>
     <detail-page title="文件发放通知单">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/grantNotice/detail.vue b/src/views/resource/file/grantNotice/detail.vue
index 3967a1a..d1df733 100644
--- a/src/views/resource/file/grantNotice/detail.vue
+++ b/src/views/resource/file/grantNotice/detail.vue
@@ -484,6 +484,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'notice-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'notice-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'notice-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/grantNotice/list.vue b/src/views/resource/file/grantNotice/list.vue
index a1ff85e..006b8b1 100644
--- a/src/views/resource/file/grantNotice/list.vue
+++ b/src/views/resource/file/grantNotice/list.vue
@@ -80,6 +80,7 @@
     router.push({
       query: {
         id: row.id,
+        status: searchQuery.value.approvalStatus,
       },
       path: 'grantNotice/approved/detail',
     })
diff --git a/src/views/resource/file/methodConfirm/list.vue b/src/views/resource/file/methodConfirm/list.vue
index 9043646..bb2c131 100644
--- a/src/views/resource/file/methodConfirm/list.vue
+++ b/src/views/resource/file/methodConfirm/list.vue
@@ -336,6 +336,16 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -361,10 +371,19 @@
         <el-input v-model="searchQuery.measureItem" placeholder="检定或校准项目" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model="searchQuery.createUserName" placeholder="编制人" clearable />
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="创建时间(开始)"
+          end-placeholder="创建时间(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/noveltySearch/approvedDetail.vue b/src/views/resource/file/noveltySearch/approvedDetail.vue
new file mode 100644
index 0000000..4f148e7
--- /dev/null
+++ b/src/views/resource/file/noveltySearch/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 测试校准检定方法查新记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileNovelty'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '测试校准检定方法查新记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '测试校准检定方法查新记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="测试校准检定方法查新记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/file/noveltySearch/list.vue b/src/views/resource/file/noveltySearch/list.vue
index ed21824..ff98baa 100644
--- a/src/views/resource/file/noveltySearch/list.vue
+++ b/src/views/resource/file/noveltySearch/list.vue
@@ -87,7 +87,16 @@
 const detail = (row: IMethodNoveltySearch) => {
   sessionStorage.setItem('noveltySearchTaskId', row.taskId!)
 
-  if (active.value === '1') {
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'noveltySearch/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
     // 全部或草稿箱 状态的 查看 是可以编辑的组件
     updateInfo(row)
   }
@@ -340,6 +349,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.noveltyDateStart = `${val[0]}`
+    searchQuery.value.noveltyDateEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.noveltyDateStart = ''
+    searchQuery.value.noveltyDateEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -359,17 +379,27 @@
         <el-input v-model="searchQuery.formNo" placeholder="记录表编号" clearable />
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable>
+        <el-select v-model="searchQuery.noveltyResult" placeholder="查新结果" clearable class="short-input">
           <el-option v-for="dict in noveltyResultDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable>
+        <el-select v-model="searchQuery.groupCode" placeholder="专业组" clearable class="short-input">
           <el-option v-for="dict in groupCodeDict" :key="dict.id" :value="dict.value" :label="dict.name" />
         </el-select>
       </search-item>
       <search-item>
-        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+        <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          range-separator="至"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="查新日期(开始)"
+          end-placeholder="查新日期(结束)"
+          class="short-input"
+        />
       </search-item>
     </search-area>
 
diff --git a/src/views/resource/file/recallArchive/approvedDetail.vue b/src/views/resource/file/recallArchive/approvedDetail.vue
index fa4f99d..b4fd679 100644
--- a/src/views/resource/file/recallArchive/approvedDetail.vue
+++ b/src/views/resource/file/recallArchive/approvedDetail.vue
@@ -1,62 +1,91 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="FileRecallArchiveDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
+<!-- 文件作废登记表 -->
+<script name="FileRecallArchiveApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/fileArchive'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
 
-// 从路由中传过来的参数
-const id = ref<string>('')
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '文件作废登记表.doc')
+    loading.close()
+  })
+}
 
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '文件作废登记表.pdf')
 }
 
 // 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
 }
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
 }
 
 onMounted(() => {
-  initDialog(route.query)
+  infoId.value = $route.query.id as string
+  init()
 })
 </script>
 
 <template>
   <app-container>
-    <detail-page title="文件收回存档登记表">
+    <detail-page title="文件作废登记表">
       <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
+        <el-button type="primary" @click="exportWord">
+          导出word
         </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
         </el-button>
-        <el-button type="primary" @click="printClickedHandler">
+        <el-button type="primary" @click="print">
           打印
         </el-button>
-
-        <el-button type="info" @click="resetForm()">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
   </app-container>
 </template>
diff --git a/src/views/resource/file/recallArchive/detail.vue b/src/views/resource/file/recallArchive/detail.vue
index 5a483bb..8be818d 100644
--- a/src/views/resource/file/recallArchive/detail.vue
+++ b/src/views/resource/file/recallArchive/detail.vue
@@ -493,6 +493,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'archive-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'archive-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'archive-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/file/recallArchive/list.vue b/src/views/resource/file/recallArchive/list.vue
index 9d7505e..0e2616e 100644
--- a/src/views/resource/file/recallArchive/list.vue
+++ b/src/views/resource/file/recallArchive/list.vue
@@ -60,6 +60,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'recallArchive/detail',
   })
@@ -332,6 +333,17 @@
   }
 }, { immediate: true })
 
+watch(dateRange, (val) => {
+  if (val) {
+    searchQuery.value.createTimeStart = `${val[0]}`
+    searchQuery.value.createTimeEnd = `${val[1]}`
+  }
+  else {
+    searchQuery.value.createTimeStart = ''
+    searchQuery.value.createTimeEnd = ''
+  }
+})
+
 onMounted(async () => {
   await getDict()
   if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
@@ -353,7 +365,16 @@
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
-      <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
+      <!-- <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" /> -->
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        range-separator="至"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+        start-placeholder="创建时间(开始)"
+        end-placeholder="创建时间(结束)"
+      />
     </search-area>
 
     <!-- 表格数据展示 -->
diff --git a/src/views/resource/outsideService/approvedDetail/consumableApply.vue b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
new file mode 100644
index 0000000..d20b826
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableApply.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资申请单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableApply as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资申请单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资申请单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资申请单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableCheck.vue b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
new file mode 100644
index 0000000..7554767
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableCheck.vue
@@ -0,0 +1,92 @@
+<!-- 物资验收记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableCheck as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资验收记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资验收记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资验收记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
new file mode 100644
index 0000000..eaf3d21
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableEvaluate.vue
@@ -0,0 +1,92 @@
+<!-- 易耗物资供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableEvaluate as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableStore.vue b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
new file mode 100644
index 0000000..d8345e0
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableStore.vue
@@ -0,0 +1,92 @@
+<!-- 物资入库单 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableStore as getStream } from '@/api/resource/supplierConsumable'
+
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '物资入库单.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '物资入库单.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="物资入库单">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/consumableUse.vue b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
new file mode 100644
index 0000000..5bc4623
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/consumableUse.vue
@@ -0,0 +1,91 @@
+<!-- 易耗物资使用记录 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStreamConsumableUse as getStream } from '@/api/resource/supplierConsumable'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '易耗物资使用记录.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '易耗物资使用记录.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="易耗物资使用记录">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
new file mode 100644
index 0000000..c45473b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/equipmentEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 设备供方评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierEquipment'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '设备供方评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '设备供方评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="设备供方评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
new file mode 100644
index 0000000..a20889b
--- /dev/null
+++ b/src/views/resource/outsideService/approvedDetail/serviceEvaluate.vue
@@ -0,0 +1,91 @@
+<!-- 外部服务评价表 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/supplierService'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '外部服务评价表.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '外部服务评价表.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="外部服务评价表">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/outsideService/consumable/applyDetail.vue b/src/views/resource/outsideService/consumable/applyDetail.vue
index 0be7347..5f61711 100644
--- a/src/views/resource/outsideService/consumable/applyDetail.vue
+++ b/src/views/resource/outsideService/consumable/applyDetail.vue
@@ -411,16 +411,19 @@
 // 选定供应商返回 允许供应商重复
 const appendToContentList = (rows: ISupplierInfo[]) => {
   rows.forEach((row) => {
-    goodsList.value.push({
-      id: '',
-      supplierId: row.id,
-      supplierName: row.supplierName,
-      goodsName: '',
-      goodsModel: '',
-      goodsQuantity: '',
-      remark: '',
-      createTime: '',
-    })
+    const index = goodsList.value.findIndex(item => item.supplierId === row.id)
+    if (index === -1) {
+      goodsList.value.push({
+        id: '',
+        supplierId: row.id,
+        supplierName: row.supplierName,
+        goodsName: '',
+        goodsModel: '',
+        goodsQuantity: '',
+        remark: '',
+        createTime: '',
+      })
+    }
   })
 }
 
diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue
index 7b7e81c..3090cc7 100644
--- a/src/views/resource/outsideService/consumable/handoverDetail.vue
+++ b/src/views/resource/outsideService/consumable/handoverDetail.vue
@@ -1,12 +1,14 @@
 <!-- 废弃物资处理交接记录 详情 -->
 <script name="ConsumableHandoverDetail" lang="ts" setup>
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IConsumableHandover, IConsumableHandoverGoods } from './consumable-interface'
 import HandoverDetailDialog from './handoverDetailDialog.vue'
 import type { IDictType } from '@/commonInterface/resource-interface'
-import { detailConsumableHandover, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
+import { detailConsumableHandover, getStreamConsumableHandover as getStream, saveConsumableHandover, updateConsumableHandover } from '@/api/resource/supplierConsumable'
 import useUserStore from '@/store/modules/user'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
 
 // 变量
 // 从路由中传过来的参数
@@ -163,21 +165,6 @@
   goodsList.value.push(useDetail)
 }
 
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -246,6 +233,48 @@
       break
   }
 }
+// --------------------------------导出word、pdf、打印----------------------------------------------------
+const stream = ref()
+const streamNormal = ref(true) // 流是否正常
+// 获取流
+const fetchStream = async (isPdf = true) => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  const res = await getStream({ id: id.value, pdf: isPdf })
+  stream.value = res.data
+  loading.close()
+}
+
+// 打印Word
+const printToWord = () => {
+  fetchStream(false).then(() => {
+    if (streamNormal.value) {
+      exportFile(stream.value, '废弃物资处理交接记录.doc')
+    }
+  })
+}
+
+// 导出PDF
+const printToPDF = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      exportFile(new Blob([stream.value]), '废弃物资处理交接记录.pdf')
+    }
+  })
+}
+
+// 打印
+const printClickedHandler = () => {
+  fetchStream().then(() => {
+    if (streamNormal.value) {
+      const blobUrl = URL.createObjectURL(stream.value)
+      printPdf(blobUrl)
+    }
+  })
+}
 
 onMounted(() => {
   initDict()
diff --git a/src/views/resource/outsideService/equipment/approvedDetail.vue b/src/views/resource/outsideService/equipment/approvedDetail.vue
deleted file mode 100644
index cb6eb81..0000000
--- a/src/views/resource/outsideService/equipment/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 设备供方评价表详情 -->
-<script name="EquipmentEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="设备供方评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/outsideService/service/approvedDetail.vue b/src/views/resource/outsideService/service/approvedDetail.vue
deleted file mode 100644
index c95d349..0000000
--- a/src/views/resource/outsideService/service/approvedDetail.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 文件收回存档登记表详情 -->
-<script name="ServiceEvaluateDetailApproved" lang="ts" setup>
-import { ElMessage } from 'element-plus'
-
-// 从路由中传过来的参数
-const id = ref<string>('')
-
-const route = useRoute()
-const router = useRouter()
-
-// 逻辑
-// 关闭
-const resetForm = () => {
-  router.go(-1)
-}
-
-// 打印
-const printClickedHandler = () => {
-  ElMessage.success('打印成功')
-}
-
-// 打印Word
-const printToWord = () => {
-  // exportFile({ id: noticeInfo.value.id, pdf: false })
-}
-
-// 打印PDF
-const printToPDF = () => {
-
-}
-
-const initDialog = (params: any) => {
-  // 从路由中获取参数
-  id.value = params.id !== undefined ? params.id : ''
-}
-
-onMounted(() => {
-  initDialog(route.query)
-})
-</script>
-
-<template>
-  <app-container>
-    <detail-page title="外部服务评价表">
-      <template #btns>
-        <el-button type="primary" @click="printToWord">
-          导出Word
-        </el-button>
-        <el-button type="primary" @click="printToPDF">
-          导出PDF
-        </el-button>
-        <el-button type="primary" @click="printClickedHandler">
-          打印
-        </el-button>
-
-        <el-button type="info" @click="resetForm()">
-          关闭
-        </el-button>
-      </template>
-    </detail-page>
-  </app-container>
-</template>
diff --git a/src/views/resource/person/trainSign/detail.vue b/src/views/resource/person/trainSign/detail.vue
index aea4857..531612d 100644
--- a/src/views/resource/person/trainSign/detail.vue
+++ b/src/views/resource/person/trainSign/detail.vue
@@ -242,14 +242,7 @@
     background: 'rgba(255, 255, 255, 0.6)',
   })
   const res = await getStream({ id: id.value, pdf: isPdf })
-  if (res.code === 200) {
-    stream.value = res.data
-    streamNormal.value = true
-  }
-  else {
-    ElMessage.warning('未获取到流文件，请联系管理员')
-    streamNormal.value = false
-  }
+  stream.value = res.data
   loading.close()
 }
 
diff --git a/src/views/resource/person/trainSign/list.vue b/src/views/resource/person/trainSign/list.vue
index 1da5a33..28a8ffd 100644
--- a/src/views/resource/person/trainSign/list.vue
+++ b/src/views/resource/person/trainSign/list.vue
@@ -1,11 +1,12 @@
 <!-- 培训签到表列表 -->
 <script name="TrainSignList" lang="ts" setup>
 import type { DateModelType } from 'element-plus'
-import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { IRegistrationForm, ISignListQuery } from './train-interface'
-import { deleteTrainSignInfo, getTrainSignList } from '@/api/resource/train'
+import { deleteTrainSignInfo, exportTrainList, getTrainSignList } from '@/api/resource/train'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
+import { exportFile } from '@/utils/exportUtils'
 
 // 定义变量
 const { proxy } = getCurrentInstance() as any
@@ -33,11 +34,41 @@
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ]) // 表头
 const list = ref([]) // 表格数据
+const checkoutList = ref([]) // 多选表格数据
 
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
 // 逻辑
 // 导出列表
 const batchExportList = () => {
-
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      fileCode: searchQuery.value.fileCode,
+      position: searchQuery.value.position,
+      host: searchQuery.value.host,
+      beginTime: searchQuery.value.beginTime,
+      endTime: searchQuery.value.endTime,
+      offset: 1,
+      limit: 20,
+      ids: checkoutList.value,
+    }
+    exportTrainList(params).then((res) => {
+      const blob = new Blob([res.data])
+      loading.close()
+      exportFile(blob, '培训签到表.xlsx')
+    })
+  }
+  else {
+    loading.close()
+    ElMessage.warning('无数据可导出数据')
+  }
 }
 
 const addTrain = () => {
@@ -212,6 +243,7 @@
         :list-loading="loadingTable"
         :is-showmulti-select="true"
         @change="changePage"
+        @multi-select="handleSelectionChange"
       >
         <template #preColumns>
           <el-table-column label="序号" width="55" align="center">
diff --git a/src/views/resource/software/info/detail.vue b/src/views/resource/software/info/detail.vue
index 60cdea7..1adf2b6 100644
--- a/src/views/resource/software/info/detail.vue
+++ b/src/views/resource/software/info/detail.vue
@@ -106,7 +106,7 @@
 
 // 编辑
 const updateById = () => {
-  updateSoftwareInfo(softwareInfo.value).then((res) => {
+  updateSoftwareInfo({ ...softwareInfo.value, updateTime: dayjs().format('YYYY-MM-DD HH:mm:ss') }).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
diff --git a/src/views/resource/software/info/list.vue b/src/views/resource/software/info/list.vue
index a174c3c..73ab906 100644
--- a/src/views/resource/software/info/list.vue
+++ b/src/views/resource/software/info/list.vue
@@ -28,7 +28,7 @@
   { text: '软件名称', value: 'softwareName', align: 'center' },
   { text: '当前版本号', value: 'softwareVersion', align: 'center', width: '200' },
   { text: '创建人', value: 'createUserName', align: 'center', width: '200' },
-  { text: '更新时间', value: 'createTime', align: 'center', width: '200' },
+  { text: '更新时间', value: 'updateTime', align: 'center', width: '200' },
 ])
 const softwareList = ref<Array<ISoftwareInfo>>([]) // 表格数据
 
@@ -135,7 +135,7 @@
         <el-input v-model="searchQuery.softwareName" placeholder="软件名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model="searchQuery.softwareVersion" placeholder="软件版本" clearable />
+        <el-input v-model="searchQuery.softwareVersion" placeholder="版本号" clearable />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
diff --git a/src/views/resource/software/review/approvedDetail.vue b/src/views/resource/software/review/approvedDetail.vue
new file mode 100644
index 0000000..d3d24f5
--- /dev/null
+++ b/src/views/resource/software/review/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 软件评审报告 -->
+<script name="FileNoveltySearchApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/softwareReport'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '软件评审报告.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '软件评审报告.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="软件评审报告">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/software/review/detail.vue b/src/views/resource/software/review/detail.vue
index ce1065d..228bba1 100644
--- a/src/views/resource/software/review/detail.vue
+++ b/src/views/resource/software/review/detail.vue
@@ -548,6 +548,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'review-report-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'review-report-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'review-report-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/software/review/list.vue b/src/views/resource/software/review/list.vue
index a83a4c8..545b8c4 100644
--- a/src/views/resource/software/review/list.vue
+++ b/src/views/resource/software/review/list.vue
@@ -69,6 +69,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'review/detail',
   })
diff --git a/src/views/resource/software/revision/approvedDetail.vue b/src/views/resource/software/revision/approvedDetail.vue
new file mode 100644
index 0000000..bb28d50
--- /dev/null
+++ b/src/views/resource/software/revision/approvedDetail.vue
@@ -0,0 +1,91 @@
+<!-- 软件修订申请 -->
+<script name="FileRevisionApproved" lang="ts" setup>
+import { ElLoading, ElMessage } from 'element-plus'
+import * as pdfjsLib from 'pdfjs-dist'
+import { exportFile } from '@/utils/exportUtils'
+import { printPdf } from '@/utils/printUtils'
+import { getBase64 } from '@/utils/download'
+import { getStream } from '@/api/resource/softwareRevision'
+const infoId = ref('') // id
+const $route = useRoute()
+const $router = useRouter()
+const pdfUrl = ref('') // pdfurl
+const pdfStream = ref() as any // pdf流
+
+// -----------------------------------------按钮--------------------------------------------------
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+// 导出word
+const exportWord = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: false }).then((res) => {
+    exportFile(res.data, '软件修订申请.doc')
+    loading.close()
+  })
+}
+
+// 导出pdf
+const exportPdf = () => {
+  exportFile(pdfStream.value, '软件修订申请.pdf')
+}
+
+// 打印
+const print = () => {
+  const blobUrl = URL.createObjectURL(pdfStream.value)
+  printPdf(blobUrl)
+}
+// -------------------------------------------------------------------------------------------
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  getStream({ id: infoId.value, pdf: true }).then((res) => {
+    pdfStream.value = new Blob([res.data])
+    getBase64(res.data).then((res) => {
+      pdfUrl.value = res as string
+    })
+    pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+    loading.close()
+  })
+}
+
+onMounted(() => {
+  infoId.value = $route.query.id as string
+  init()
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="软件修订申请">
+      <template #btns>
+        <el-button type="primary" @click="exportWord">
+          导出word
+        </el-button>
+        <el-button type="primary" @click="exportPdf">
+          导出pdf
+        </el-button>
+        <el-button type="primary" @click="print">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <div style="display: flex;justify-content: center; margin-top: 10px;width: 100%;">
+      <file-preview :pdf-url="pdfUrl" style="width: 70%;" />
+    </div>
+  </app-container>
+</template>
diff --git a/src/views/resource/software/revision/detail.vue b/src/views/resource/software/revision/detail.vue
index 45c4d45..7e8c56e 100644
--- a/src/views/resource/software/revision/detail.vue
+++ b/src/views/resource/software/revision/detail.vue
@@ -461,6 +461,20 @@
   }
 }
 
+watch(() => status.value, (val) => {
+  if (val === '1' || type.value === 'create') { // 草稿箱把审批详情删了
+    if (radioItems.value[radioItems.value.length - 1].value === 'revision-report-approval') {
+      radioItems.value.pop()
+    }
+    console.log(radioItems.value)
+  }
+  else { // 非全部和草稿箱把审批详情加上
+    if (radioItems.value[radioItems.value.length - 1].value !== 'revision-report-approval') {
+      radioItems.value.push({ name: '审批详情', value: 'revision-report-approval' })
+    }
+  }
+})
+
 onMounted(() => {
   initDict()
   initDialog(route.query)
diff --git a/src/views/resource/software/revision/list.vue b/src/views/resource/software/revision/list.vue
index 8e6ac67..4d06020 100644
--- a/src/views/resource/software/revision/list.vue
+++ b/src/views/resource/software/revision/list.vue
@@ -64,6 +64,7 @@
   router.push({
     query: {
       type: 'create',
+      status: searchQuery.value.approvalStatus,
     },
     path: 'revision/detail',
   })
diff --git a/src/views/resource/technology/data/detail.vue b/src/views/resource/technology/data/detail.vue
index 5efc4fc..a063649 100644
--- a/src/views/resource/technology/data/detail.vue
+++ b/src/views/resource/technology/data/detail.vue
@@ -108,6 +108,12 @@
 
 // 上传请求
 const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  console.log('90908098', file)
+
+  if (file.file.type !== 'application/pdf') {
+    ElMessage.warning('请上传pdf格式')
+    return
+  }
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   const loading = ElLoading.service({